diff --git a/core/block.ts b/core/block.ts
index 0861f7188..c802a5d3c 100644
--- a/core/block.ts
+++ b/core/block.ts
@@ -13,6 +13,7 @@
  * The class representing one block.
  * @class
  */
+goog.declareModuleId('Blockly.Block');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/block_animations.ts b/core/block_animations.ts
index a1688d2dc..737b57d78 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
  */
+goog.declareModuleId('Blockly.blockAnimations');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
diff --git a/core/block_drag_surface.ts b/core/block_drag_surface.ts
index 53d70b3eb..173662ff2 100644
--- a/core/block_drag_surface.ts
+++ b/core/block_drag_surface.ts
@@ -23,6 +23,7 @@
  * while dragging blocks.
  * @class
  */
+goog.declareModuleId('Blockly.BlockDragSurfaceSvg');
 
 import {Coordinate} from './utils/coordinate.js';
 import * as dom from './utils/dom.js';
diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index 975db615f..c83d877cb 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a block visually.
  * @class
  */
+goog.declareModuleId('Blockly.BlockDragger');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_drag';
diff --git a/core/block_svg.ts b/core/block_svg.ts
index e44f19d70..5ae6b9e79 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -13,6 +13,8 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+goog.declareModuleId('Blockly.BlockSvg');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './theme';
diff --git a/core/blockly.ts b/core/blockly.ts
index 6ba32cf73..31e00b621 100644
--- a/core/blockly.ts
+++ b/core/blockly.ts
@@ -13,6 +13,8 @@
  * The top level namespace used to access the Blockly library.
  * @namespace Blockly
  */
+goog.declareModuleId('Blockly');
+
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_create';
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/blockly_options.ts b/core/blockly_options.ts
index 5d40469eb..f90a326bd 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
  */
+goog.declareModuleId('Blockly.BlocklyOptions');
 
 
 /**
diff --git a/core/blocks.ts b/core/blocks.ts
index faa939d16..bca44e58d 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
  */
+goog.declareModuleId('Blockly.blocks');
 
 
 /**
diff --git a/core/browser_events.ts b/core/browser_events.ts
index 48f20e176..c373aaf58 100644
--- a/core/browser_events.ts
+++ b/core/browser_events.ts
@@ -13,6 +13,7 @@
  * Browser event handling.
  * @namespace Blockly.browserEvents
  */
+goog.declareModuleId('Blockly.browserEvents');
 
 import * as Touch from './touch.js';
 import * as userAgent from './utils/useragent.js';
diff --git a/core/bubble.ts b/core/bubble.ts
index ae6f651aa..64884d49d 100644
--- a/core/bubble.ts
+++ b/core/bubble.ts
@@ -13,6 +13,8 @@
  * Object representing a UI bubble.
  * @class
  */
+goog.declareModuleId('Blockly.Bubble');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './metrics_manager';
diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts
index d2086b264..8b6ef70be 100644
--- a/core/bubble_dragger.ts
+++ b/core/bubble_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a bubble visually.
  * @class
  */
+goog.declareModuleId('Blockly.BubbleDragger');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './bubble';
diff --git a/core/bump_objects.ts b/core/bump_objects.ts
index a5b3908c7..ae0ea0864 100644
--- a/core/bump_objects.ts
+++ b/core/bump_objects.ts
@@ -13,6 +13,8 @@
  * Utilities for bumping objects back into worksapce bounds.
  * @namespace Blockly.bumpObjects
  */
+goog.declareModuleId('Blockly.bumpObjects');
+
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/clipboard.ts b/core/clipboard.ts
index 770e64aee..6bfcf23b7 100644
--- a/core/clipboard.ts
+++ b/core/clipboard.ts
@@ -13,6 +13,8 @@
  * Blockly's internal clipboard for managing copy-paste.
  * @namespace Blockly.clipboard
  */
+goog.declareModuleId('Blockly.clipboard');
+
 import {CopyData, ICopyable} from './interfaces/i_copyable.js';
 
 
diff --git a/core/comment.ts b/core/comment.ts
index 7c57c8d18..1532ea1ff 100644
--- a/core/comment.ts
+++ b/core/comment.ts
@@ -13,6 +13,8 @@
  * Object representing a code comment.
  * @class
  */
+goog.declareModuleId('Blockly.Comment');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './block';
diff --git a/core/common.ts b/core/common.ts
index acb033fe7..36a3eb26a 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
  */
+goog.declareModuleId('Blockly.common');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/component_manager.ts b/core/component_manager.ts
index 983429712..0fe4d873d 100644
--- a/core/component_manager.ts
+++ b/core/component_manager.ts
@@ -13,6 +13,7 @@
  * Manager for all items registered with the workspace.
  * @class
  */
+goog.declareModuleId('Blockly.ComponentManager');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IAutoHideable} from './interfaces/i_autohideable.js';
diff --git a/core/config.ts b/core/config.ts
index 0d1c4f313..de953ff54 100644
--- a/core/config.ts
+++ b/core/config.ts
@@ -17,6 +17,8 @@
  * generally recommended.
  * @namespace Blockly.config
  */
+goog.declareModuleId('Blockly.config');
+
 /**
  * All the values that we expect developers to be able to change
  * before injecting Blockly.
diff --git a/core/connection.ts b/core/connection.ts
index a743ffc10..67d8c2403 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -13,6 +13,7 @@
  * Components for creating connections between blocks.
  * @class
  */
+goog.declareModuleId('Blockly.Connection');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
diff --git a/core/connection_checker.ts b/core/connection_checker.ts
index fe593b656..ef06f8eae 100644
--- a/core/connection_checker.ts
+++ b/core/connection_checker.ts
@@ -15,6 +15,7 @@
  * potential connection is safe and valid.
  * @class
  */
+goog.declareModuleId('Blockly.ConnectionChecker');
 
 import * as common from './common.js';
 import {Connection} from './connection.js';
diff --git a/core/connection_db.ts b/core/connection_db.ts
index fcb7160e9..36585c0d9 100644
--- a/core/connection_db.ts
+++ b/core/connection_db.ts
@@ -17,6 +17,7 @@
  *    Sorted by y coordinate.
  * @class
  */
+goog.declareModuleId('Blockly.ConnectionDB');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
diff --git a/core/connection_type.ts b/core/connection_type.ts
index 6637536c8..c58d2742e 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
  */
+goog.declareModuleId('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/constants.ts b/core/constants.ts
index e6632db12..bacad4408 100644
--- a/core/constants.ts
+++ b/core/constants.ts
@@ -13,6 +13,7 @@
  * Blockly constants.
  * @namespace Blockly.constants
  */
+goog.declareModuleId('Blockly.constants');
 
 
 /**
diff --git a/core/contextmenu.ts b/core/contextmenu.ts
index 5673cf4e2..e1720432d 100644
--- a/core/contextmenu.ts
+++ b/core/contextmenu.ts
@@ -13,6 +13,8 @@
  * Functionality for the right-click context menus.
  * @namespace Blockly.ContextMenu
  */
+goog.declareModuleId('Blockly.ContextMenu');
+
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/contextmenu_items.ts b/core/contextmenu_items.ts
index 86ede9ddb..5a1bfe342 100644
--- a/core/contextmenu_items.ts
+++ b/core/contextmenu_items.ts
@@ -13,6 +13,8 @@
  * Registers default context menu items.
  * @namespace Blockly.ContextMenuItems
  */
+goog.declareModuleId('Blockly.ContextMenuItems');
+
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
 import * as clipboard from './clipboard.js';
diff --git a/core/contextmenu_registry.ts b/core/contextmenu_registry.ts
index 7fb47a52d..073006a51 100644
--- a/core/contextmenu_registry.ts
+++ b/core/contextmenu_registry.ts
@@ -13,6 +13,7 @@
  * Registry for context menu option items.
  * @class
  */
+goog.declareModuleId('Blockly.ContextMenuRegistry');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
diff --git a/core/css.ts b/core/css.ts
index b587dfbe2..afd54a6b7 100644
--- a/core/css.ts
+++ b/core/css.ts
@@ -13,6 +13,7 @@
  * Inject Blockly's CSS synchronously.
  * @namespace Blockly.Css
  */
+goog.declareModuleId('Blockly.Css');
 
 import * as deprecation from './utils/deprecation.js';
 
diff --git a/core/delete_area.ts b/core/delete_area.ts
index 49394cf43..7a13c5d2c 100644
--- a/core/delete_area.ts
+++ b/core/delete_area.ts
@@ -16,6 +16,7 @@
  * bubble that is dropped on top of it.
  * @class
  */
+goog.declareModuleId('Blockly.DeleteArea');
 
 import {BlockSvg} from './block_svg.js';
 import {DragTarget} from './drag_target.js';
diff --git a/core/dialog.ts b/core/dialog.ts
index e79d854b1..917a2f5fc 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
  */
+goog.declareModuleId('Blockly.dialog');
 
 let alertImplementation = function(
     message: AnyDuringMigration, opt_callback: AnyDuringMigration) {
diff --git a/core/drag_target.ts b/core/drag_target.ts
index 519cddb0d..edfe7cf4d 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
  */
+goog.declareModuleId('Blockly.DragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IDragTarget} from './interfaces/i_drag_target.js';
diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts
index 6d97c5bd4..bc6b32eac 100644
--- a/core/dropdowndiv.ts
+++ b/core/dropdowndiv.ts
@@ -15,6 +15,8 @@
  * A div that floats on top of the workspace, for drop-down menus.
  * @class
  */
+goog.declareModuleId('Blockly.dropDownDiv');
+
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
 import * as common from './common.js';
diff --git a/core/events/events.ts b/core/events/events.ts
index 0f2e5c8e8..b0aa9f268 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
  */
+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 7c8452ed5..04bf17ed0 100644
--- a/core/events/events_abstract.ts
+++ b/core/events/events_abstract.ts
@@ -15,6 +15,7 @@
  * Blockly's editor.
  * @class
  */
+goog.declareModuleId('Blockly.Events.Abstract');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Workspace} from '../workspace.js';
diff --git a/core/events/events_block_base.ts b/core/events/events_block_base.ts
index 5c21554ce..60cb6367b 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
  */
+goog.declareModuleId('Blockly.Events.BlockBase');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_block_change.ts b/core/events/events_block_change.ts
index 073e098c6..62f9ab27c 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
  */
+goog.declareModuleId('Blockly.Events.BlockChange');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_block_create.ts b/core/events/events_block_create.ts
index 0a3ec4576..d11f3d1b0 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
  */
+goog.declareModuleId('Blockly.Events.BlockCreate');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_block_delete.ts b/core/events/events_block_delete.ts
index 0cbdfd44c..8ff18b21d 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
  */
+goog.declareModuleId('Blockly.Events.BlockDelete');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_block_drag.ts b/core/events/events_block_drag.ts
index 5d996037f..c1f32f9a3 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
  */
+goog.declareModuleId('Blockly.Events.BlockDrag');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_block_move.ts b/core/events/events_block_move.ts
index a2f33a68d..c990162cd 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
  */
+goog.declareModuleId('Blockly.Events.BlockMove');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_bubble_open.ts b/core/events/events_bubble_open.ts
index 3c69bbff3..cb24d062a 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
  */
+goog.declareModuleId('Blockly.Events.BubbleOpen');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../block_svg.js';
diff --git a/core/events/events_click.ts b/core/events/events_click.ts
index 64f805036..e0ecba064 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
  */
+goog.declareModuleId('Blockly.Events.Click');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_comment_base.ts b/core/events/events_comment_base.ts
index 262b67be6..3fcdcd10f 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
  */
+goog.declareModuleId('Blockly.Events.CommentBase');
 
 import * as utilsXml from '../utils/xml.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_change.ts b/core/events/events_comment_change.ts
index c79472d46..576be9805 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
  */
+goog.declareModuleId('Blockly.Events.CommentChange');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_create.ts b/core/events/events_comment_create.ts
index acb3d4b8d..46a012732 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
  */
+goog.declareModuleId('Blockly.Events.CommentCreate');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_delete.ts b/core/events/events_comment_delete.ts
index f6752b10c..6f51b569f 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
  */
+goog.declareModuleId('Blockly.Events.CommentDelete');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_move.ts b/core/events/events_comment_move.ts
index 86338ac7f..91ca0cebf 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
  */
+goog.declareModuleId('Blockly.Events.CommentMove');
 
 import * as registry from '../registry.js';
 import {Coordinate} from '../utils/coordinate.js';
diff --git a/core/events/events_marker_move.ts b/core/events/events_marker_move.ts
index 7eb414470..8df9460bc 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
  */
+goog.declareModuleId('Blockly.Events.MarkerMove');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_selected.ts b/core/events/events_selected.ts
index 72aa1c175..d53ab436e 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
  */
+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 4e9b6ccec..f6a0199b2 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
  */
+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 1279c6e7c..0e86d4965 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
  */
+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 f738f9d43..262a1291c 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
  */
+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 8267c9dcb..ceb6707fa 100644
--- a/core/events/events_ui.ts
+++ b/core/events/events_ui.ts
@@ -15,6 +15,7 @@
  * Blockly's editor.
  * @class
  */
+goog.declareModuleId('Blockly.Events.Ui');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/events_ui_base.ts b/core/events/events_ui_base.ts
index 4339b3540..2efd4f103 100644
--- a/core/events/events_ui_base.ts
+++ b/core/events/events_ui_base.ts
@@ -15,6 +15,8 @@
  * Blockly's editor.
  * @class
  */
+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 3cbda211f..bf70096ff 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
  */
+goog.declareModuleId('Blockly.Events.VarBase');
 
 /* eslint-disable-next-line no-unused-vars */
 import {VariableModel} from '../variable_model.js';
diff --git a/core/events/events_var_create.ts b/core/events/events_var_create.ts
index dbfce7e4a..2bb5d23e2 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
  */
+goog.declareModuleId('Blockly.Events.VarCreate');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts
index c51fe7015..06cfc04ff 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
  */
+goog.declareModuleId('Blockly.Events.VarDelete');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts
index 4d3afecdd..4f1b05ebe 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
  */
+goog.declareModuleId('Blockly.Events.VarRename');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_viewport.ts b/core/events/events_viewport.ts
index 311d620a7..7fdd3ebbe 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
  */
+goog.declareModuleId('Blockly.Events.ViewportChange');
 
 import * as registry from '../registry.js';
 
diff --git a/core/events/utils.ts b/core/events/utils.ts
index 1b1308751..8fae8a1df 100644
--- a/core/events/utils.ts
+++ b/core/events/utils.ts
@@ -15,6 +15,7 @@
  * actions in Blockly's editor.
  * @namespace Blockly.Events.utils
  */
+goog.declareModuleId('Blockly.Events.utils');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/events/workspace_events.ts b/core/events/workspace_events.ts
index f05d83a44..1b961189c 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
  */
+goog.declareModuleId('Blockly.Events.FinishedLoading');
 
 import * as registry from '../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/extensions.ts b/core/extensions.ts
index a81855ff5..ad02a8a28 100644
--- a/core/extensions.ts
+++ b/core/extensions.ts
@@ -19,6 +19,8 @@
  *      array attribute.
  * @namespace Blockly.Extensions
  */
+goog.declareModuleId('Blockly.Extensions');
+
 // Unused import preserved for side-effects. Remove if unneeded.
 import './mutator';
 
diff --git a/core/field.ts b/core/field.ts
index 70a14b737..9b2c12388 100644
--- a/core/field.ts
+++ b/core/field.ts
@@ -17,6 +17,8 @@
  * instances would be FieldTextInput, FieldDropdown, etc.
  * @class
  */
+goog.declareModuleId('Blockly.Field');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './shortcut_registry';
diff --git a/core/field_angle.ts b/core/field_angle.ts
index c070c203a..ad7b1458b 100644
--- a/core/field_angle.ts
+++ b/core/field_angle.ts
@@ -13,6 +13,7 @@
  * Angle input field.
  * @class
  */
+goog.declareModuleId('Blockly.FieldAngle');
 
 import {BlockSvg} from './block_svg.js';
 import * as browserEvents from './browser_events.js';
diff --git a/core/field_checkbox.ts b/core/field_checkbox.ts
index 796115ff5..b6ae2742d 100644
--- a/core/field_checkbox.ts
+++ b/core/field_checkbox.ts
@@ -13,6 +13,7 @@
  * Checkbox field.  Checked or not checked.
  * @class
  */
+goog.declareModuleId('Blockly.FieldCheckbox');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_colour.ts b/core/field_colour.ts
index d2f9af070..15c03b80e 100644
--- a/core/field_colour.ts
+++ b/core/field_colour.ts
@@ -13,6 +13,7 @@
  * Colour input field.
  * @class
  */
+goog.declareModuleId('Blockly.FieldColour');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_dropdown.ts b/core/field_dropdown.ts
index 0bfeb4dd5..c518dc880 100644
--- a/core/field_dropdown.ts
+++ b/core/field_dropdown.ts
@@ -17,6 +17,7 @@
  * properties with the context menu.
  * @class
  */
+goog.declareModuleId('Blockly.FieldDropdown');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
diff --git a/core/field_image.ts b/core/field_image.ts
index 2d2aa7411..10c14befa 100644
--- a/core/field_image.ts
+++ b/core/field_image.ts
@@ -13,6 +13,7 @@
  * Image field.  Used for pictures, icons, etc.
  * @class
  */
+goog.declareModuleId('Blockly.FieldImage');
 
 import {Field} from './field.js';
 import * as fieldRegistry from './field_registry.js';
diff --git a/core/field_label.ts b/core/field_label.ts
index b5740ff8e..21ffabaa7 100644
--- a/core/field_label.ts
+++ b/core/field_label.ts
@@ -15,6 +15,7 @@
  *    labels, etc.
  * @class
  */
+goog.declareModuleId('Blockly.FieldLabel');
 
 import {Field} from './field.js';
 import * as fieldRegistry from './field_registry.js';
diff --git a/core/field_label_serializable.ts b/core/field_label_serializable.ts
index b73a0b61b..ce03b45a5 100644
--- a/core/field_label_serializable.ts
+++ b/core/field_label_serializable.ts
@@ -17,6 +17,7 @@
  *    edited programmatically.
  * @class
  */
+goog.declareModuleId('Blockly.FieldLabelSerializable');
 
 import {FieldLabel} from './field_label.js';
 import * as fieldRegistry from './field_registry.js';
diff --git a/core/field_multilineinput.ts b/core/field_multilineinput.ts
index 6afa5df8e..0441269fa 100644
--- a/core/field_multilineinput.ts
+++ b/core/field_multilineinput.ts
@@ -13,6 +13,7 @@
  * Text Area field.
  * @class
  */
+goog.declareModuleId('Blockly.FieldMultilineInput');
 
 import * as Css from './css.js';
 import {Field} from './field.js';
diff --git a/core/field_number.ts b/core/field_number.ts
index 38ddcd722..fdba25c60 100644
--- a/core/field_number.ts
+++ b/core/field_number.ts
@@ -13,6 +13,7 @@
  * Number input field
  * @class
  */
+goog.declareModuleId('Blockly.FieldNumber');
 
 import {Field} from './field.js';
 import * as fieldRegistry from './field_registry.js';
diff --git a/core/field_registry.ts b/core/field_registry.ts
index 90ed89725..e035191e3 100644
--- a/core/field_registry.ts
+++ b/core/field_registry.ts
@@ -17,6 +17,7 @@
  *    fields based on JSON.
  * @namespace Blockly.fieldRegistry
  */
+goog.declareModuleId('Blockly.fieldRegistry');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from './field.js';
diff --git a/core/field_textinput.ts b/core/field_textinput.ts
index a3c26e467..ae3904c75 100644
--- a/core/field_textinput.ts
+++ b/core/field_textinput.ts
@@ -13,6 +13,7 @@
  * Text input field.
  * @class
  */
+goog.declareModuleId('Blockly.FieldTextInput');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_variable.ts b/core/field_variable.ts
index 1b27892cb..accf33ddb 100644
--- a/core/field_variable.ts
+++ b/core/field_variable.ts
@@ -13,6 +13,8 @@
  * Variable input field.
  * @class
  */
+goog.declareModuleId('Blockly.FieldVariable');
+
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
 
diff --git a/core/flyout_base.ts b/core/flyout_base.ts
index 71c2494ff..9197bedcc 100644
--- a/core/flyout_base.ts
+++ b/core/flyout_base.ts
@@ -13,6 +13,7 @@
  * Flyout tray containing blocks which may be created.
  * @class
  */
+goog.declareModuleId('Blockly.Flyout');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block.js';
diff --git a/core/flyout_button.ts b/core/flyout_button.ts
index e5d4947fa..639aa3ad8 100644
--- a/core/flyout_button.ts
+++ b/core/flyout_button.ts
@@ -13,6 +13,7 @@
  * Class for a button in the flyout.
  * @class
  */
+goog.declareModuleId('Blockly.FlyoutButton');
 
 import * as browserEvents from './browser_events.js';
 import * as Css from './css.js';
diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts
index 0fb9301a3..44476d59e 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
  */
+goog.declareModuleId('Blockly.HorizontalFlyout');
 
 import * as browserEvents from './browser_events.js';
 import * as dropDownDiv from './dropdowndiv.js';
diff --git a/core/flyout_metrics_manager.ts b/core/flyout_metrics_manager.ts
index 5c0fcfd10..cadffe402 100644
--- a/core/flyout_metrics_manager.ts
+++ b/core/flyout_metrics_manager.ts
@@ -13,6 +13,7 @@
  * Calculates and reports flyout workspace metrics.
  * @class
  */
+goog.declareModuleId('Blockly.FlyoutMetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IFlyout} from './interfaces/i_flyout.js';
diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts
index 5b3750a42..0711d4d68 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
  */
+goog.declareModuleId('Blockly.VerticalFlyout');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './block';
diff --git a/core/generator.ts b/core/generator.ts
index 447a59d59..7b46e5b0b 100644
--- a/core/generator.ts
+++ b/core/generator.ts
@@ -15,6 +15,7 @@
  * Blockly code.
  * @class
  */
+goog.declareModuleId('Blockly.Generator');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block.js';
diff --git a/core/gesture.ts b/core/gesture.ts
index dbda6bf80..e25b2fe17 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -15,6 +15,7 @@
  * or a tap.
  * @class
  */
+goog.declareModuleId('Blockly.Gesture');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './block_dragger';
diff --git a/core/grid.ts b/core/grid.ts
index d6c62e9e9..3f37e7fc9 100644
--- a/core/grid.ts
+++ b/core/grid.ts
@@ -15,6 +15,7 @@
  * Blockly.
  * @class
  */
+goog.declareModuleId('Blockly.Grid');
 
 import * as dom from './utils/dom.js';
 import {Svg} from './utils/svg.js';
diff --git a/core/icon.ts b/core/icon.ts
index 6cd6ed27e..e81eb175f 100644
--- a/core/icon.ts
+++ b/core/icon.ts
@@ -13,6 +13,7 @@
  * Object representing an icon on a block.
  * @class
  */
+goog.declareModuleId('Blockly.Icon');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg.js';
diff --git a/core/inject.ts b/core/inject.ts
index f43cfbebc..5e4d17a7e 100644
--- a/core/inject.ts
+++ b/core/inject.ts
@@ -13,6 +13,7 @@
  * Functions for injecting Blockly into a web page.
  * @namespace Blockly.inject
  */
+goog.declareModuleId('Blockly.inject');
 
 import 'angular-mocks';
 
diff --git a/core/input.ts b/core/input.ts
index 7c2559b9b..71adfb345 100644
--- a/core/input.ts
+++ b/core/input.ts
@@ -13,6 +13,7 @@
  * Object representing an input (value, statement, or dummy).
  * @class
  */
+goog.declareModuleId('Blockly.Input');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './field_label';
diff --git a/core/input_types.ts b/core/input_types.ts
index b191e7584..9e1cf99d9 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
  */
+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 c949f8e4b..91e00b786 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
  */
+goog.declareModuleId('Blockly.InsertionMarkerManager');
 
 import * as blockAnimations from './block_animations.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_ast_node_location.ts b/core/interfaces/i_ast_node_location.ts
index 4419d57c6..df28c9787 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
  */
+goog.declareModuleId('Blockly.IASTNodeLocation');
 
 /**
  * An AST node location interface.
diff --git a/core/interfaces/i_ast_node_location_svg.ts b/core/interfaces/i_ast_node_location_svg.ts
index 8538fc005..031481b8d 100644
--- a/core/interfaces/i_ast_node_location_svg.ts
+++ b/core/interfaces/i_ast_node_location_svg.ts
@@ -13,6 +13,8 @@
  * The interface for an AST node location SVG.
  * @namespace Blockly.IASTNodeLocationSvg
  */
+goog.declareModuleId('Blockly.IASTNodeLocationSvg');
+
 /* eslint-disable-next-line no-unused-vars */
 import {IASTNodeLocation} from './i_ast_node_location.js';
 
diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts
index 809ac73cd..978329035 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
  */
+goog.declareModuleId('Blockly.IASTNodeLocationWithBlock');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_autohideable.ts b/core/interfaces/i_autohideable.ts
index d52ca0840..afb6a96cd 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
  */
+goog.declareModuleId('Blockly.IAutoHideable');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IComponent} from './i_component.js';
diff --git a/core/interfaces/i_block_dragger.ts b/core/interfaces/i_block_dragger.ts
index 4dde17b68..a9bb177db 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
  */
+goog.declareModuleId('Blockly.IBlockDragger');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_bounded_element.ts b/core/interfaces/i_bounded_element.ts
index 6ebe60dde..6f6a76b8c 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
  */
+goog.declareModuleId('Blockly.IBoundedElement');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts
index 5f3dd4dd3..0158d39bd 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
  */
+goog.declareModuleId('Blockly.IBubble');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_collapsible_toolbox_item.ts b/core/interfaces/i_collapsible_toolbox_item.ts
index 5789775ca..68c055de4 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
  */
+goog.declareModuleId('Blockly.ICollapsibleToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_component.ts b/core/interfaces/i_component.ts
index f75c72e06..b677b3cd7 100644
--- a/core/interfaces/i_component.ts
+++ b/core/interfaces/i_component.ts
@@ -16,6 +16,7 @@
  * the ComponentManager.
  * @namespace Blockly.IComponent
  */
+goog.declareModuleId('Blockly.IComponent');
 
 
 /**
diff --git a/core/interfaces/i_connection_checker.ts b/core/interfaces/i_connection_checker.ts
index 43419917a..d769dea34 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
  */
+goog.declareModuleId('Blockly.IConnectionChecker');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_contextmenu.ts b/core/interfaces/i_contextmenu.ts
index 9898c65fc..e1eac2e5c 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
  */
+goog.declareModuleId('Blockly.IContextMenu');
 
 
 /** @alias Blockly.IContextMenu */
diff --git a/core/interfaces/i_copyable.ts b/core/interfaces/i_copyable.ts
index 9d65d38d6..739e0e2b1 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
  */
+goog.declareModuleId('Blockly.ICopyable');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_deletable.ts b/core/interfaces/i_deletable.ts
index fec70770d..602c518ea 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
  */
+goog.declareModuleId('Blockly.IDeletable');
 
 
 /**
diff --git a/core/interfaces/i_delete_area.ts b/core/interfaces/i_delete_area.ts
index 795ac8ef8..5b2870d5c 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
  */
+goog.declareModuleId('Blockly.IDeleteArea');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_drag_target.ts b/core/interfaces/i_drag_target.ts
index 9a34e999d..1e678dcc1 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
  */
+goog.declareModuleId('Blockly.IDragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_draggable.ts b/core/interfaces/i_draggable.ts
index 48fe04ae6..e39cdad29 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
  */
+goog.declareModuleId('Blockly.IDraggable');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IDeletable} from './i_deletable.js';
diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts
index 3ff9b0dd2..373297afd 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
  */
+goog.declareModuleId('Blockly.IFlyout');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_keyboard_accessible.ts b/core/interfaces/i_keyboard_accessible.ts
index 905caf030..1246f4d65 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
  */
+goog.declareModuleId('Blockly.IKeyboardAccessible');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts
index 3a5405756..f155ef494 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
  */
+goog.declareModuleId('Blockly.IMetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_movable.ts b/core/interfaces/i_movable.ts
index 8db9de0c2..fc5692390 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
  */
+goog.declareModuleId('Blockly.IMovable');
 
 
 /**
diff --git a/core/interfaces/i_positionable.ts b/core/interfaces/i_positionable.ts
index 0062a59ca..36a3eb998 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
  */
+goog.declareModuleId('Blockly.IPositionable');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_registrable.ts b/core/interfaces/i_registrable.ts
index c7201be8f..2f65dbdf4 100644
--- a/core/interfaces/i_registrable.ts
+++ b/core/interfaces/i_registrable.ts
@@ -16,6 +16,7 @@
  *    (Ex. Toolbox, Fields, Renderers)
  * @namespace Blockly.IRegistrable
  */
+goog.declareModuleId('Blockly.IRegistrable');
 
 
 /**
diff --git a/core/interfaces/i_registrable_field.ts b/core/interfaces/i_registrable_field.ts
index 57e5c6f33..01e770dbb 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
  */
+goog.declareModuleId('Blockly.IRegistrableField');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from '../field.js';
diff --git a/core/interfaces/i_selectable.ts b/core/interfaces/i_selectable.ts
index e77210301..434485df1 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
  */
+goog.declareModuleId('Blockly.ISelectable');
 
 // eslint-disable-next-line no-unused-vars
 import {IDeletable} from './i_deletable.js';
diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts
index 1a6a5d53a..682fc2630 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
  */
+goog.declareModuleId('Blockly.ISelectableToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_serializer.ts b/core/interfaces/i_serializer.ts
index 8056370d3..a6dd291f8 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
  */
+goog.declareModuleId('Blockly.serialization.ISerializer');
 
 // eslint-disable-next-line no-unused-vars
 import {Workspace} from '../workspace.js';
diff --git a/core/interfaces/i_styleable.ts b/core/interfaces/i_styleable.ts
index 80188fb6b..5bbc13d48 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
  */
+goog.declareModuleId('Blockly.IStyleable');
 
 
 /**
diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts
index 960b1e369..4f6eae98a 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
  */
+goog.declareModuleId('Blockly.IToolbox');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_toolbox_item.ts b/core/interfaces/i_toolbox_item.ts
index 9f6ec4234..d23590f28 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
  */
+goog.declareModuleId('Blockly.IToolboxItem');
 
 
 /**
diff --git a/core/internal_constants.ts b/core/internal_constants.ts
index 289248597..a3fe75cb9 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
  */
+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 0893eb324..5cf422955 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
  */
+goog.declareModuleId('Blockly.ASTNode');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/keyboard_nav/basic_cursor.ts b/core/keyboard_nav/basic_cursor.ts
index 740a5fc68..2be84881d 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
  */
+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 97de295b2..b6eb51ceb 100644
--- a/core/keyboard_nav/cursor.ts
+++ b/core/keyboard_nav/cursor.ts
@@ -15,6 +15,7 @@
  * Used primarily for keyboard navigation.
  * @class
  */
+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 0b14de93f..9907c65f3 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
  */
+goog.declareModuleId('Blockly.Marker');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/keyboard_nav/tab_navigate_cursor.ts b/core/keyboard_nav/tab_navigate_cursor.ts
index 77f8c951b..c19a5a695 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
  */
+goog.declareModuleId('Blockly.TabNavigateCursor');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from '../field.js';
diff --git a/core/marker_manager.ts b/core/marker_manager.ts
index d72ffcc5e..2997911ed 100644
--- a/core/marker_manager.ts
+++ b/core/marker_manager.ts
@@ -13,6 +13,8 @@
  * Object in charge of managing markers and the cursor.
  * @class
  */
+goog.declareModuleId('Blockly.MarkerManager');
+
 /* eslint-disable-next-line no-unused-vars */
 import {Cursor} from './keyboard_nav/cursor.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/menu.ts b/core/menu.ts
index c981304ac..660612880 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -13,6 +13,7 @@
  * Blockly menu similar to Closure's goog.ui.Menu
  * @class
  */
+goog.declareModuleId('Blockly.Menu');
 
 import * as browserEvents from './browser_events.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/menuitem.ts b/core/menuitem.ts
index d9cd5bed1..96707fdf7 100644
--- a/core/menuitem.ts
+++ b/core/menuitem.ts
@@ -13,6 +13,7 @@
  * Blockly menu item similar to Closure's goog.ui.MenuItem
  * @class
  */
+goog.declareModuleId('Blockly.MenuItem');
 
 import * as aria from './utils/aria.js';
 import * as dom from './utils/dom.js';
diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts
index 9a3c9b616..c3c0ef182 100644
--- a/core/metrics_manager.ts
+++ b/core/metrics_manager.ts
@@ -13,6 +13,7 @@
  * Calculates and reports workspace metrics.
  * @class
  */
+goog.declareModuleId('Blockly.MetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
 import {IFlyout} from './interfaces/i_flyout.js';
diff --git a/core/msg.ts b/core/msg.ts
index 685428af2..59cfa053c 100644
--- a/core/msg.ts
+++ b/core/msg.ts
@@ -13,6 +13,7 @@
  * Empty name space for the Message singleton.
  * @namespace Blockly.Msg
  */
+goog.declareModuleId('Blockly.Msg');
 
 
 /** A dictionary of localised messages. */
diff --git a/core/mutator.ts b/core/mutator.ts
index db9f0da2c..c1be8bfe8 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
  */
+goog.declareModuleId('Blockly.Mutator');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
diff --git a/core/names.ts b/core/names.ts
index 01caee0b9..899a1b274 100644
--- a/core/names.ts
+++ b/core/names.ts
@@ -13,6 +13,7 @@
  * Utility functions for handling variable and procedure names.
  * @class
  */
+goog.declareModuleId('Blockly.Names');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './procedures';
diff --git a/core/options.ts b/core/options.ts
index 669e02ac8..df1e2a275 100644
--- a/core/options.ts
+++ b/core/options.ts
@@ -13,6 +13,7 @@
  * Object that controls settings for the workspace.
  * @class
  */
+goog.declareModuleId('Blockly.Options');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlocklyOptions} from './blockly_options.js';
diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts
index e26ef36d5..af5b4b532 100644
--- a/core/positionable_helpers.ts
+++ b/core/positionable_helpers.ts
@@ -13,6 +13,8 @@
  * Utility functions for positioning UI elements.
  * @namespace Blockly.uiPosition
  */
+goog.declareModuleId('Blockly.uiPosition');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './metrics_manager';
diff --git a/core/procedures.ts b/core/procedures.ts
index 33c5b7026..ba4de680b 100644
--- a/core/procedures.ts
+++ b/core/procedures.ts
@@ -13,6 +13,8 @@
  * Utility functions for handling procedures.
  * @namespace Blockly.Procedures
  */
+goog.declareModuleId('Blockly.Procedures');
+
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
 
diff --git a/core/registry.ts b/core/registry.ts
index a6ce0b4a5..6e573a20f 100644
--- a/core/registry.ts
+++ b/core/registry.ts
@@ -15,6 +15,7 @@
  *    for registering and unregistering different types of classes.
  * @namespace Blockly.registry
  */
+goog.declareModuleId('Blockly.registry');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Abstract} from './events/events_abstract.js';
diff --git a/core/rendered_connection.ts b/core/rendered_connection.ts
index 1d0c0d21c..08e5339ee 100644
--- a/core/rendered_connection.ts
+++ b/core/rendered_connection.ts
@@ -13,6 +13,7 @@
  * Components for creating connections between blocks.
  * @class
  */
+goog.declareModuleId('Blockly.RenderedConnection');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block.js';
diff --git a/core/renderers/common/block_rendering.ts b/core/renderers/common/block_rendering.ts
index 6cb066466..09cb546b3 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
  */
+goog.declareModuleId('Blockly.blockRendering');
 
 import * as registry from '../../registry.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/constants.ts b/core/renderers/common/constants.ts
index ab7fb831d..65be90d8e 100644
--- a/core/renderers/common/constants.ts
+++ b/core/renderers/common/constants.ts
@@ -13,6 +13,8 @@
  * An object that provides constants for rendering blocks.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.ConstantProvider');
+
 import {ConnectionType} from '../../connection_type.js';
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection.js';
diff --git a/core/renderers/common/debug.ts b/core/renderers/common/debug.ts
index af56c400c..9d57f841a 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
  */
+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 d6ea702a6..486f3da3a 100644
--- a/core/renderers/common/debugger.ts
+++ b/core/renderers/common/debugger.ts
@@ -13,6 +13,7 @@
  * Methods for rendering debug graphics.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Debug');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/common/drawer.ts b/core/renderers/common/drawer.ts
index cdfd4b75a..698b274d5 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
  */
+goog.declareModuleId('Blockly.blockRendering.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
index f6cbcf1ed..2ac445890 100644
--- a/core/renderers/common/i_path_object.ts
+++ b/core/renderers/common/i_path_object.ts
@@ -16,6 +16,8 @@
  * elements.
  * @namespace Blockly.blockRendering.IPathObject
  */
+goog.declareModuleId('Blockly.blockRendering.IPathObject');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../block_svg';
diff --git a/core/renderers/common/info.ts b/core/renderers/common/info.ts
index cd013813e..11b4aba6e 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
  */
+goog.declareModuleId('Blockly.blockRendering.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/common/marker_svg.ts b/core/renderers/common/marker_svg.ts
index 8c14fdd43..76c4942d7 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
  */
+goog.declareModuleId('Blockly.blockRendering.MarkerSvg');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../events/events_marker_move';
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
index 8ee6850e4..a34838818 100644
--- a/core/renderers/common/path_object.ts
+++ b/core/renderers/common/path_object.ts
@@ -13,6 +13,8 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.PathObject');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts
index f798542ec..bf065b84d 100644
--- a/core/renderers/common/renderer.ts
+++ b/core/renderers/common/renderer.ts
@@ -13,6 +13,8 @@
  * Base renderer.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Renderer');
+
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../../block.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/constants.ts b/core/renderers/geras/constants.ts
index 8ab88c7e1..088f6a182 100644
--- a/core/renderers/geras/constants.ts
+++ b/core/renderers/geras/constants.ts
@@ -15,6 +15,7 @@
  * mode.
  * @class
  */
+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 b1295d4f5..280194bc4 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
  */
+goog.declareModuleId('Blockly.geras.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/geras/geras.ts b/core/renderers/geras/geras.ts
index ec065f9ff..30fcd8ea6 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
  */
+goog.declareModuleId('Blockly.geras');
 
 import {ConstantProvider} from './constants.js';
 import {Drawer} from './drawer.js';
diff --git a/core/renderers/geras/highlight_constants.ts b/core/renderers/geras/highlight_constants.ts
index 66a1fb95d..156daaf02 100644
--- a/core/renderers/geras/highlight_constants.ts
+++ b/core/renderers/geras/highlight_constants.ts
@@ -13,6 +13,8 @@
  * Objects for rendering highlights on blocks.
  * @class
  */
+goog.declareModuleId('Blockly.geras.HighlightConstantProvider');
+
 import * as svgPaths from '../../utils/svg_paths.js';
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts
index 25da8dfed..bb6620e24 100644
--- a/core/renderers/geras/highlighter.ts
+++ b/core/renderers/geras/highlighter.ts
@@ -15,6 +15,7 @@
  * compatibility mode.
  * @class
  */
+goog.declareModuleId('Blockly.geras.Highlighter');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/geras/info.ts b/core/renderers/geras/info.ts
index 4c5fe396c..ec810b72e 100644
--- a/core/renderers/geras/info.ts
+++ b/core/renderers/geras/info.ts
@@ -15,6 +15,7 @@
  * Geras: spirit of old age.
  * @class
  */
+goog.declareModuleId('Blockly.geras.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/geras/measurables/inline_input.ts b/core/renderers/geras/measurables/inline_input.ts
index 79670d2f9..f8988ddea 100644
--- a/core/renderers/geras/measurables/inline_input.ts
+++ b/core/renderers/geras/measurables/inline_input.ts
@@ -15,6 +15,8 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.geras.InlineInput');
+
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
 import {Input} from '../../../input.js';
diff --git a/core/renderers/geras/measurables/statement_input.ts b/core/renderers/geras/measurables/statement_input.ts
index 723b3ca14..6b703a9ba 100644
--- a/core/renderers/geras/measurables/statement_input.ts
+++ b/core/renderers/geras/measurables/statement_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.geras.StatementInput');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts
index 5aeb7bd29..ec93113df 100644
--- a/core/renderers/geras/path_object.ts
+++ b/core/renderers/geras/path_object.ts
@@ -13,6 +13,8 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+goog.declareModuleId('Blockly.geras.PathObject');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts
index 6c16aa7c3..81b82e47d 100644
--- a/core/renderers/geras/renderer.ts
+++ b/core/renderers/geras/renderer.ts
@@ -13,6 +13,8 @@
  * Geras renderer.
  * @class
  */
+goog.declareModuleId('Blockly.geras.Renderer');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../common/constants';
diff --git a/core/renderers/measurables/base.ts b/core/renderers/measurables/base.ts
index bfff4a66f..f31c6f624 100644
--- a/core/renderers/measurables/base.ts
+++ b/core/renderers/measurables/base.ts
@@ -13,6 +13,8 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Measurable');
+
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
 
diff --git a/core/renderers/measurables/bottom_row.ts b/core/renderers/measurables/bottom_row.ts
index 940b41bef..9810b7f27 100644
--- a/core/renderers/measurables/bottom_row.ts
+++ b/core/renderers/measurables/bottom_row.ts
@@ -15,6 +15,7 @@
  * of its subcomponents.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.BottomRow');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/measurables/connection.ts b/core/renderers/measurables/connection.ts
index 6d48e9163..ba3887f54 100644
--- a/core/renderers/measurables/connection.ts
+++ b/core/renderers/measurables/connection.ts
@@ -15,6 +15,7 @@
  * rendering.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Connection');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/external_value_input.ts b/core/renderers/measurables/external_value_input.ts
index 1d7f5a0b2..abd5a3110 100644
--- a/core/renderers/measurables/external_value_input.ts
+++ b/core/renderers/measurables/external_value_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.ExternalValueInput');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/field.ts b/core/renderers/measurables/field.ts
index 3b46e97b0..4e5f09aef 100644
--- a/core/renderers/measurables/field.ts
+++ b/core/renderers/measurables/field.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Field');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/hat.ts b/core/renderers/measurables/hat.ts
index 48d34004c..885e4b9af 100644
--- a/core/renderers/measurables/hat.ts
+++ b/core/renderers/measurables/hat.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Hat');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/icon.ts b/core/renderers/measurables/icon.ts
index 271580811..bbdd806d1 100644
--- a/core/renderers/measurables/icon.ts
+++ b/core/renderers/measurables/icon.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.Icon');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/in_row_spacer.ts b/core/renderers/measurables/in_row_spacer.ts
index e1b013904..86800ae74 100644
--- a/core/renderers/measurables/in_row_spacer.ts
+++ b/core/renderers/measurables/in_row_spacer.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.InRowSpacer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/inline_input.ts b/core/renderers/measurables/inline_input.ts
index e5c299957..f486c5b26 100644
--- a/core/renderers/measurables/inline_input.ts
+++ b/core/renderers/measurables/inline_input.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.InlineInput');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/input_connection.ts b/core/renderers/measurables/input_connection.ts
index 115100aa4..22629ce7c 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
  */
+goog.declareModuleId('Blockly.blockRendering.InputConnection');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/measurables/input_row.ts b/core/renderers/measurables/input_row.ts
index 3c902fc48..0d8027e03 100644
--- a/core/renderers/measurables/input_row.ts
+++ b/core/renderers/measurables/input_row.ts
@@ -15,6 +15,8 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.InputRow');
+
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
 
diff --git a/core/renderers/measurables/jagged_edge.ts b/core/renderers/measurables/jagged_edge.ts
index 2cbb51e79..0fd33da13 100644
--- a/core/renderers/measurables/jagged_edge.ts
+++ b/core/renderers/measurables/jagged_edge.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.JaggedEdge');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/next_connection.ts b/core/renderers/measurables/next_connection.ts
index 775c0b189..eefc2f244 100644
--- a/core/renderers/measurables/next_connection.ts
+++ b/core/renderers/measurables/next_connection.ts
@@ -15,6 +15,8 @@
  * rendering.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.NextConnection');
+
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/output_connection.ts b/core/renderers/measurables/output_connection.ts
index b076b6a5a..7693239bb 100644
--- a/core/renderers/measurables/output_connection.ts
+++ b/core/renderers/measurables/output_connection.ts
@@ -15,6 +15,7 @@
  * during rendering.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.OutputConnection');
 
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection.js';
diff --git a/core/renderers/measurables/previous_connection.ts b/core/renderers/measurables/previous_connection.ts
index 1f45056b5..b83814354 100644
--- a/core/renderers/measurables/previous_connection.ts
+++ b/core/renderers/measurables/previous_connection.ts
@@ -15,6 +15,7 @@
  * during rendering.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.PreviousConnection');
 
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection.js';
diff --git a/core/renderers/measurables/round_corner.ts b/core/renderers/measurables/round_corner.ts
index afbe78dc8..12c1c918e 100644
--- a/core/renderers/measurables/round_corner.ts
+++ b/core/renderers/measurables/round_corner.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.RoundCorner');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/row.ts b/core/renderers/measurables/row.ts
index 5e87b2fc8..802570011 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
  */
+goog.declareModuleId('Blockly.blockRendering.Row');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/spacer_row.ts b/core/renderers/measurables/spacer_row.ts
index 3c1a85786..f85e360f8 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
  */
+goog.declareModuleId('Blockly.blockRendering.SpacerRow');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/square_corner.ts b/core/renderers/measurables/square_corner.ts
index e543fa0ef..ce3b3771e 100644
--- a/core/renderers/measurables/square_corner.ts
+++ b/core/renderers/measurables/square_corner.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.SquareCorner');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/measurables/statement_input.ts b/core/renderers/measurables/statement_input.ts
index 3a16d1120..0c536a3fa 100644
--- a/core/renderers/measurables/statement_input.ts
+++ b/core/renderers/measurables/statement_input.ts
@@ -15,6 +15,8 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.blockRendering.StatementInput');
+
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
 import {Input} from '../../input.js';
diff --git a/core/renderers/measurables/top_row.ts b/core/renderers/measurables/top_row.ts
index 89907e4bb..16fb97cc3 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
  */
+goog.declareModuleId('Blockly.blockRendering.TopRow');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/measurables/types.ts b/core/renderers/measurables/types.ts
index 9fa0b5c32..2fe131a53 100644
--- a/core/renderers/measurables/types.ts
+++ b/core/renderers/measurables/types.ts
@@ -13,6 +13,8 @@
  * Measurable types.
  * @namespace Blockly.blockRendering.Types
  */
+goog.declareModuleId('Blockly.blockRendering.Types');
+
 /* eslint-disable-next-line no-unused-vars */
 import {Measurable} from './base.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/constants.ts b/core/renderers/minimalist/constants.ts
index a7a3c3a1e..c56502c85 100644
--- a/core/renderers/minimalist/constants.ts
+++ b/core/renderers/minimalist/constants.ts
@@ -15,6 +15,7 @@
  * minimalist renderer.
  * @class
  */
+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 8004cbe0f..11c50e076 100644
--- a/core/renderers/minimalist/drawer.ts
+++ b/core/renderers/minimalist/drawer.ts
@@ -13,6 +13,7 @@
  * Minimalist rendering drawer.
  * @class
  */
+goog.declareModuleId('Blockly.minimalist.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/minimalist/info.ts b/core/renderers/minimalist/info.ts
index 9e14ae419..9e8560366 100644
--- a/core/renderers/minimalist/info.ts
+++ b/core/renderers/minimalist/info.ts
@@ -13,6 +13,7 @@
  * Minimalist render info object.
  * @class
  */
+goog.declareModuleId('Blockly.minimalist.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/minimalist/minimalist.ts b/core/renderers/minimalist/minimalist.ts
index fe563b138..7a38cc27a 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
  */
+goog.declareModuleId('Blockly.minimalist');
 
 import {ConstantProvider} from './constants.js';
 import {Drawer} from './drawer.js';
diff --git a/core/renderers/minimalist/renderer.ts b/core/renderers/minimalist/renderer.ts
index 410336432..2774a78dd 100644
--- a/core/renderers/minimalist/renderer.ts
+++ b/core/renderers/minimalist/renderer.ts
@@ -13,6 +13,7 @@
  * Minimalist renderer.
  * @class
  */
+goog.declareModuleId('Blockly.minimalist.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/thrasos/info.ts b/core/renderers/thrasos/info.ts
index 17358563f..57d31c9c9 100644
--- a/core/renderers/thrasos/info.ts
+++ b/core/renderers/thrasos/info.ts
@@ -15,6 +15,7 @@
  * Thrasos: spirit of boldness.
  * @class
  */
+goog.declareModuleId('Blockly.thrasos.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/thrasos/renderer.ts b/core/renderers/thrasos/renderer.ts
index e7a72257d..765e048fe 100644
--- a/core/renderers/thrasos/renderer.ts
+++ b/core/renderers/thrasos/renderer.ts
@@ -13,6 +13,7 @@
  * Thrasos renderer.
  * @class
  */
+goog.declareModuleId('Blockly.thrasos.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/thrasos/thrasos.ts b/core/renderers/thrasos/thrasos.ts
index 1c849bc46..28b7e112a 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
  */
+goog.declareModuleId('Blockly.thrasos');
 
 import {RenderInfo} from './info.js';
 import {Renderer} from './renderer.js';
diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts
index 41e4cd2a7..4af302399 100644
--- a/core/renderers/zelos/constants.ts
+++ b/core/renderers/zelos/constants.ts
@@ -15,6 +15,8 @@
  * mode.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.ConstantProvider');
+
 import {ConnectionType} from '../../connection_type.js';
 import {RenderedConnection} from '../../rendered_connection.js';
 import {Theme} from '../../theme.js';
diff --git a/core/renderers/zelos/drawer.ts b/core/renderers/zelos/drawer.ts
index d00df89e9..93db949b6 100644
--- a/core/renderers/zelos/drawer.ts
+++ b/core/renderers/zelos/drawer.ts
@@ -13,6 +13,7 @@
  * Zelos renderer.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts
index b8af223f2..295d74243 100644
--- a/core/renderers/zelos/info.ts
+++ b/core/renderers/zelos/info.ts
@@ -14,6 +14,7 @@
  * Makecode/scratch-style renderer.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/zelos/marker_svg.ts b/core/renderers/zelos/marker_svg.ts
index 8c6f3b286..9de798c4b 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
  */
+goog.declareModuleId('Blockly.zelos.MarkerSvg');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg.js';
diff --git a/core/renderers/zelos/measurables/bottom_row.ts b/core/renderers/zelos/measurables/bottom_row.ts
index a9dfbf39a..97f72e47e 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
  */
+goog.declareModuleId('Blockly.zelos.BottomRow');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../../block_svg.js';
diff --git a/core/renderers/zelos/measurables/inputs.ts b/core/renderers/zelos/measurables/inputs.ts
index 67f852a7a..e741238aa 100644
--- a/core/renderers/zelos/measurables/inputs.ts
+++ b/core/renderers/zelos/measurables/inputs.ts
@@ -15,6 +15,7 @@
  * a rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.StatementInput');
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/row_elements.ts b/core/renderers/zelos/measurables/row_elements.ts
index 6eb43f517..e121af56c 100644
--- a/core/renderers/zelos/measurables/row_elements.ts
+++ b/core/renderers/zelos/measurables/row_elements.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.RightConnectionShape');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../../../renderers/common/constants.js';
diff --git a/core/renderers/zelos/measurables/top_row.ts b/core/renderers/zelos/measurables/top_row.ts
index c227788b0..b751c0d75 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
  */
+goog.declareModuleId('Blockly.zelos.TopRow');
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../../block_svg.js';
diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts
index 483157e7f..e475ee942 100644
--- a/core/renderers/zelos/path_object.ts
+++ b/core/renderers/zelos/path_object.ts
@@ -13,6 +13,8 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.PathObject');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts
index fa309980a..9378e8310 100644
--- a/core/renderers/zelos/renderer.ts
+++ b/core/renderers/zelos/renderer.ts
@@ -13,6 +13,8 @@
  * Zelos renderer.
  * @class
  */
+goog.declareModuleId('Blockly.zelos.Renderer');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
diff --git a/core/renderers/zelos/zelos.ts b/core/renderers/zelos/zelos.ts
index 5e64cb052..9b3e82807 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
  */
+goog.declareModuleId('Blockly.zelos');
 
 import {ConstantProvider} from './constants.js';
 import {Drawer} from './drawer.js';
diff --git a/core/scrollbar.ts b/core/scrollbar.ts
index 6bf80ab5e..b82ed74e8 100644
--- a/core/scrollbar.ts
+++ b/core/scrollbar.ts
@@ -13,6 +13,7 @@
  * Object representing a scrollbar.
  * @class
  */
+goog.declareModuleId('Blockly.Scrollbar');
 
 import * as browserEvents from './browser_events.js';
 import * as Touch from './touch.js';
diff --git a/core/scrollbar_pair.ts b/core/scrollbar_pair.ts
index 1e3aab376..b58a5f903 100644
--- a/core/scrollbar_pair.ts
+++ b/core/scrollbar_pair.ts
@@ -13,6 +13,7 @@
  * Object representing a pair of scrollbars.
  * @class
  */
+goog.declareModuleId('Blockly.ScrollbarPair');
 
 import * as eventUtils from './events/utils.js';
 import {Scrollbar} from './scrollbar.js';
diff --git a/core/serialization/blocks.ts b/core/serialization/blocks.ts
index 213188808..9cbbfb2da 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
  */
+goog.declareModuleId('Blockly.serialization.blocks');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/serialization/exceptions.ts b/core/serialization/exceptions.ts
index 61d9703d7..c5e3f9bf3 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
  */
+goog.declareModuleId('Blockly.serialization.exceptions');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block.js';
diff --git a/core/serialization/priorities.ts b/core/serialization/priorities.ts
index 7f0d53117..d1b7ce67f 100644
--- a/core/serialization/priorities.ts
+++ b/core/serialization/priorities.ts
@@ -18,6 +18,7 @@
  * priorities are deserialized first.
  * @namespace Blockly.serialization.priorities
  */
+goog.declareModuleId('Blockly.serialization.priorities');
 
 
 /**
diff --git a/core/serialization/registry.ts b/core/serialization/registry.ts
index e1e6a0c33..fe036b082 100644
--- a/core/serialization/registry.ts
+++ b/core/serialization/registry.ts
@@ -15,6 +15,7 @@
  * etc).
  * @namespace Blockly.serialization.registry
  */
+goog.declareModuleId('Blockly.serialization.registry');
 
 // eslint-disable-next-line no-unused-vars
 import {ISerializer} from '../interfaces/i_serializer.js';
diff --git a/core/serialization/variables.ts b/core/serialization/variables.ts
index 178767af0..191f26912 100644
--- a/core/serialization/variables.ts
+++ b/core/serialization/variables.ts
@@ -15,6 +15,7 @@
  * state.
  * @namespace Blockly.serialization.variables
  */
+goog.declareModuleId('Blockly.serialization.variables');
 
 // eslint-disable-next-line no-unused-vars
 import {ISerializer} from '../interfaces/i_serializer.js';
diff --git a/core/serialization/workspaces.ts b/core/serialization/workspaces.ts
index eef9e4806..dc4399d1e 100644
--- a/core/serialization/workspaces.ts
+++ b/core/serialization/workspaces.ts
@@ -15,6 +15,7 @@
  * objects.
  * @namespace Blockly.serialization.workspaces
  */
+goog.declareModuleId('Blockly.serialization.workspaces');
 
 import * as eventUtils from '../events/utils.js';
 import {ISerializer} from '../interfaces/i_serializer.js';
diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts
index d6e52b930..23d33861b 100644
--- a/core/shortcut_items.ts
+++ b/core/shortcut_items.ts
@@ -13,6 +13,8 @@
  * Registers default keyboard shortcuts.
  * @namespace Blockly.ShortcutItems
  */
+goog.declareModuleId('Blockly.ShortcutItems');
+
 import {BlockSvg} from './block_svg.js';
 import * as clipboard from './clipboard.js';
 import * as common from './common.js';
diff --git a/core/shortcut_registry.ts b/core/shortcut_registry.ts
index 363eb2fb0..ad16b58d1 100644
--- a/core/shortcut_registry.ts
+++ b/core/shortcut_registry.ts
@@ -15,6 +15,7 @@
  * key codes used to execute those shortcuts.
  * @class
  */
+goog.declareModuleId('Blockly.ShortcutRegistry');
 
 import {KeyCodes} from './utils/keycodes.js';
 import * as object from './utils/object.js';
diff --git a/core/sprites.ts b/core/sprites.ts
index c4187a23c..f3b25d072 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.
  */
+goog.declareModuleId('Blockly.sprite');
 
 
 /**
diff --git a/core/theme.ts b/core/theme.ts
index 8c13d9ac1..460cd9a86 100644
--- a/core/theme.ts
+++ b/core/theme.ts
@@ -13,6 +13,7 @@
  * The class representing a theme.
  * @class
  */
+goog.declareModuleId('Blockly.Theme');
 
 import * as registry from './registry.js';
 import * as object from './utils/object.js';
diff --git a/core/theme/classic.ts b/core/theme/classic.ts
index 7b45c81b8..d69094d44 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
  */
+goog.declareModuleId('Blockly.Themes.Classic');
 
 import {Theme} from '../theme.js';
 
diff --git a/core/theme/themes.ts b/core/theme/themes.ts
index 993cc5e5b..0d6a0b9f5 100644
--- a/core/theme/themes.ts
+++ b/core/theme/themes.ts
@@ -13,6 +13,7 @@
  * Namespace for themes.
  * @namespace Blockly.Themes
  */
+goog.declareModuleId('Blockly.Themes');
 
 import {Classic} from './classic.js';
 import {Zelos} from './zelos.js';
diff --git a/core/theme/zelos.ts b/core/theme/zelos.ts
index 859dde88e..45a629e8e 100644
--- a/core/theme/zelos.ts
+++ b/core/theme/zelos.ts
@@ -13,6 +13,7 @@
  * Zelos theme.
  * @namespace Blockly.Themes.Zelos
  */
+goog.declareModuleId('Blockly.Themes.Zelos');
 
 import {Theme} from '../theme.js';
 
diff --git a/core/theme_manager.ts b/core/theme_manager.ts
index 33942cde5..7396e7e7c 100644
--- a/core/theme_manager.ts
+++ b/core/theme_manager.ts
@@ -15,6 +15,7 @@
  *     and UI components.
  * @class
  */
+goog.declareModuleId('Blockly.ThemeManager');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Theme} from './theme.js';
diff --git a/core/toolbox/category.ts b/core/toolbox/category.ts
index 8a0048f8b..834925e93 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
  */
+goog.declareModuleId('Blockly.ToolboxCategory');
 
 import * as Css from '../css.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/collapsible_category.ts b/core/toolbox/collapsible_category.ts
index 607f9db47..6aee5d049 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
  */
+goog.declareModuleId('Blockly.CollapsibleToolboxCategory');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item.js';
diff --git a/core/toolbox/separator.ts b/core/toolbox/separator.ts
index c2c916119..1e48eb567 100644
--- a/core/toolbox/separator.ts
+++ b/core/toolbox/separator.ts
@@ -13,6 +13,7 @@
  * A separator used for separating toolbox categories.
  * @class
  */
+goog.declareModuleId('Blockly.ToolboxSeparator');
 
 import * as Css from '../css.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts
index d69c97175..58a493d4b 100644
--- a/core/toolbox/toolbox.ts
+++ b/core/toolbox/toolbox.ts
@@ -13,6 +13,8 @@
  * Toolbox from whence to create blocks.
  * @class
  */
+goog.declareModuleId('Blockly.Toolbox');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../shortcut_registry';
diff --git a/core/toolbox/toolbox_item.ts b/core/toolbox/toolbox_item.ts
index 11327e5e4..0be62cf73 100644
--- a/core/toolbox/toolbox_item.ts
+++ b/core/toolbox/toolbox_item.ts
@@ -13,6 +13,7 @@
  * An item in the toolbox.
  * @class
  */
+goog.declareModuleId('Blockly.ToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
 import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item.js';
diff --git a/core/tooltip.ts b/core/tooltip.ts
index 4c75cc441..1bf9f5c23 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
  */
+goog.declareModuleId('Blockly.Tooltip');
 
 import * as browserEvents from './browser_events.js';
 import * as common from './common.js';
diff --git a/core/touch.ts b/core/touch.ts
index dbcf3480c..b5bb6ffd6 100644
--- a/core/touch.ts
+++ b/core/touch.ts
@@ -13,6 +13,7 @@
  * Touch handling for Blockly.
  * @namespace Blockly.Touch
  */
+goog.declareModuleId('Blockly.Touch');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Gesture} from './gesture.js';
diff --git a/core/touch_gesture.ts b/core/touch_gesture.ts
index 3ff74cfb5..37fdaf13c 100644
--- a/core/touch_gesture.ts
+++ b/core/touch_gesture.ts
@@ -15,6 +15,7 @@
  * for both pointer and touch events.
  * @class
  */
+goog.declareModuleId('Blockly.TouchGesture');
 
 import * as browserEvents from './browser_events.js';
 import {Gesture} from './gesture.js';
diff --git a/core/trashcan.ts b/core/trashcan.ts
index a560b0635..41840229b 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -13,6 +13,8 @@
  * Object representing a trash can icon.
  * @class
  */
+goog.declareModuleId('Blockly.Trashcan');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './metrics_manager';
diff --git a/core/utils.ts b/core/utils.ts
index cf996dc76..20a23932a 100644
--- a/core/utils.ts
+++ b/core/utils.ts
@@ -13,6 +13,7 @@
  * Utility methods.
  * @namespace Blockly.utils
  */
+goog.declareModuleId('Blockly.utils');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block.js';
diff --git a/core/utils/aria.ts b/core/utils/aria.ts
index 3140a52a8..ef8f93569 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
  */
+goog.declareModuleId('Blockly.utils.aria');
 
 
 /** ARIA states/properties prefix. */
diff --git a/core/utils/array.ts b/core/utils/array.ts
index 3dfd31fce..73cd4b8bb 100644
--- a/core/utils/array.ts
+++ b/core/utils/array.ts
@@ -19,6 +19,8 @@
  * @return True if an element was removed.
  * @alias Blockly.array.removeElem
  */
+goog.declareModuleId('Blockly.utils.array');
+
 export function removeElem(
     arr: AnyDuringMigration[], value: AnyDuringMigration): boolean {
   const i = arr.indexOf(value);
diff --git a/core/utils/colour.ts b/core/utils/colour.ts
index 3907eab05..195d07b1d 100644
--- a/core/utils/colour.ts
+++ b/core/utils/colour.ts
@@ -13,6 +13,7 @@
  * Utility methods for colour manipulation.
  * @namespace Blockly.utils.colour
  */
+goog.declareModuleId('Blockly.utils.colour');
 
 /**
  * The richness of block colours, regardless of the hue.
diff --git a/core/utils/coordinate.ts b/core/utils/coordinate.ts
index 03ae7902d..7d171fa5b 100644
--- a/core/utils/coordinate.ts
+++ b/core/utils/coordinate.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+goog.declareModuleId('Blockly.utils.Coordinate');
 
 /**
  * Class for representing coordinates and positions.
diff --git a/core/utils/deprecation.ts b/core/utils/deprecation.ts
index 6a8c49ceb..947237f7c 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
  */
+goog.declareModuleId('Blockly.utils.deprecation');
 
 
 /**
diff --git a/core/utils/dom.ts b/core/utils/dom.ts
index 94aef8c32..237a96d9a 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
  */
+goog.declareModuleId('Blockly.utils.dom');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Svg} from './svg.js';
diff --git a/core/utils/idgenerator.ts b/core/utils/idgenerator.ts
index 2ce5290ce..475710b9b 100644
--- a/core/utils/idgenerator.ts
+++ b/core/utils/idgenerator.ts
@@ -13,6 +13,7 @@
  * Generators for unique IDs.
  * @namespace Blockly.utils.idGenerator
  */
+goog.declareModuleId('Blockly.utils.idGenerator');
 
 
 /**
diff --git a/core/utils/keycodes.ts b/core/utils/keycodes.ts
index 8603e370f..c590ee3b4 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
  */
+goog.declareModuleId('Blockly.utils.KeyCodes');
 
 
 /**
diff --git a/core/utils/math.ts b/core/utils/math.ts
index bae9af0a9..77b801a4b 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
  */
+goog.declareModuleId('Blockly.utils.math');
 
 
 /**
diff --git a/core/utils/metrics.ts b/core/utils/metrics.ts
index 33394fa84..1fc4d9fba 100644
--- a/core/utils/metrics.ts
+++ b/core/utils/metrics.ts
@@ -13,6 +13,7 @@
  * Workspace metrics definitions.
  * @namespace Blockly.utils.Metrics
  */
+goog.declareModuleId('Blockly.utils.Metrics');
 
 
 /** @alias Blockly.utils.Metrics */
diff --git a/core/utils/object.ts b/core/utils/object.ts
index 527b411f9..ab0fd523a 100644
--- a/core/utils/object.ts
+++ b/core/utils/object.ts
@@ -13,6 +13,7 @@
  * Utility methods for objects.
  * @namespace Blockly.utils.object
  */
+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 13665332a..d6f9e1206 100644
--- a/core/utils/parsing.ts
+++ b/core/utils/parsing.ts
@@ -12,6 +12,7 @@
 /**
  * @namespace Blockly.utils.parsing
  */
+goog.declareModuleId('Blockly.utils.parsing');
 
 import {Msg} from '../msg.js';
 
diff --git a/core/utils/rect.ts b/core/utils/rect.ts
index 48daf2662..b533ec62c 100644
--- a/core/utils/rect.ts
+++ b/core/utils/rect.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+goog.declareModuleId('Blockly.utils.Rect');
 
 
 /**
diff --git a/core/utils/sentinel.ts b/core/utils/sentinel.ts
index cce85b4bd..8f46a440b 100644
--- a/core/utils/sentinel.ts
+++ b/core/utils/sentinel.ts
@@ -13,6 +13,7 @@
  * A type used to create flag values.
  * @class
  */
+goog.declareModuleId('Blockly.utils.Sentinel');
 
 
 /**
diff --git a/core/utils/size.ts b/core/utils/size.ts
index 3f22b398e..b7c775b4d 100644
--- a/core/utils/size.ts
+++ b/core/utils/size.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+goog.declareModuleId('Blockly.utils.Size');
 
 
 /**
diff --git a/core/utils/string.ts b/core/utils/string.ts
index 01454e433..8d9c6a300 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
  */
+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 fca7798b4..c0354193a 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
  */
+goog.declareModuleId('Blockly.utils.style');
 
 import {Coordinate} from './coordinate.js';
 import {Rect} from './rect.js';
diff --git a/core/utils/svg.ts b/core/utils/svg.ts
index 32e79fa24..f734ee52b 100644
--- a/core/utils/svg.ts
+++ b/core/utils/svg.ts
@@ -15,6 +15,7 @@
  * all SVG tag names used by Blockly.
  * @class
  */
+goog.declareModuleId('Blockly.utils.Svg');
 
 
 /**
diff --git a/core/utils/svg_math.ts b/core/utils/svg_math.ts
index fa160e798..59055b42d 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
  */
+goog.declareModuleId('Blockly.utils.svgMath');
 
 /* eslint-disable-next-line no-unused-vars */
 import {WorkspaceSvg} from '../workspace_svg.js';
diff --git a/core/utils/svg_paths.ts b/core/utils/svg_paths.ts
index 716929b80..50791a719 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
  */
+goog.declareModuleId('Blockly.utils.svgPaths');
 
 
 /**
diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts
index d8c9e0c23..c3d6bedda 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -13,6 +13,8 @@
  * Utility functions for the toolbox and flyout.
  * @namespace Blockly.utils.toolbox
  */
+goog.declareModuleId('Blockly.utils.toolbox');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../toolbox/category';
diff --git a/core/utils/useragent.ts b/core/utils/useragent.ts
index 94d4d7a8e..2f406a665 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
  */
+goog.declareModuleId('Blockly.utils.userAgent');
 
 /** The raw useragent string. */
 let rawUserAgent: string;
diff --git a/core/utils/xml.ts b/core/utils/xml.ts
index 60ad00b03..663c4924d 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
  */
+goog.declareModuleId('Blockly.utils.xml');
 
 /**
  * Namespace for Blockly's XML.
diff --git a/core/variable_map.ts b/core/variable_map.ts
index f43fbfd0a..b93d7c37a 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
  */
+goog.declareModuleId('Blockly.VariableMap');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_var_delete';
diff --git a/core/variable_model.ts b/core/variable_model.ts
index 22d652ea4..9076eb353 100644
--- a/core/variable_model.ts
+++ b/core/variable_model.ts
@@ -13,6 +13,7 @@
  * Components for the variable model.
  * @class
  */
+goog.declareModuleId('Blockly.VariableModel');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_var_create';
diff --git a/core/variables.ts b/core/variables.ts
index 85f15b913..f1f38d7c0 100644
--- a/core/variables.ts
+++ b/core/variables.ts
@@ -13,6 +13,7 @@
  * Utility functions for handling variables.
  * @namespace Blockly.Variables
  */
+goog.declareModuleId('Blockly.Variables');
 
 import {Blocks} from './blocks.js';
 import * as dialog from './dialog.js';
diff --git a/core/variables_dynamic.ts b/core/variables_dynamic.ts
index 39543e317..35dba869c 100644
--- a/core/variables_dynamic.ts
+++ b/core/variables_dynamic.ts
@@ -14,6 +14,7 @@
  *
  * @namespace Blockly.VariablesDynamic
  */
+goog.declareModuleId('Blockly.VariablesDynamic');
 
 import {Blocks} from './blocks.js';
 import {Msg} from './msg.js';
diff --git a/core/warning.ts b/core/warning.ts
index fea3371cc..fdf5e31fa 100644
--- a/core/warning.ts
+++ b/core/warning.ts
@@ -13,6 +13,7 @@
  * Object representing a warning.
  * @class
  */
+goog.declareModuleId('Blockly.Warning');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
diff --git a/core/widgetdiv.ts b/core/widgetdiv.ts
index fd7c64df8..101f84309 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
  */
+goog.declareModuleId('Blockly.WidgetDiv');
 
 import * as common from './common.js';
 import * as deprecation from './utils/deprecation.js';
diff --git a/core/workspace.ts b/core/workspace.ts
index f768c8c9f..20497f270 100644
--- a/core/workspace.ts
+++ b/core/workspace.ts
@@ -13,6 +13,7 @@
  * Object representing a workspace.
  * @class
  */
+goog.declareModuleId('Blockly.Workspace');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './connection_checker';
diff --git a/core/workspace_audio.ts b/core/workspace_audio.ts
index bec42d430..5814ed9e1 100644
--- a/core/workspace_audio.ts
+++ b/core/workspace_audio.ts
@@ -15,6 +15,7 @@
  *     workspace.
  * @class
  */
+goog.declareModuleId('Blockly.WorkspaceAudio');
 
 import * as userAgent from './utils/useragent.js';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts
index 2130a8aad..7d3ee7c83 100644
--- a/core/workspace_comment.ts
+++ b/core/workspace_comment.ts
@@ -13,6 +13,7 @@
  * Object representing a code comment on the workspace.
  * @class
  */
+goog.declareModuleId('Blockly.WorkspaceComment');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_comment_change';
diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts
index e1e7bb7d8..95604579c 100644
--- a/core/workspace_comment_svg.ts
+++ b/core/workspace_comment_svg.ts
@@ -13,6 +13,8 @@
  * Object representing a code comment on a rendered workspace.
  * @class
  */
+goog.declareModuleId('Blockly.WorkspaceCommentSvg');
+
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_comment_create';
 // 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 fd375c303..50bb536c5 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
  */
+goog.declareModuleId('Blockly.WorkspaceDragSurfaceSvg');
 
 /* eslint-disable-next-line no-unused-vars */
 import {Coordinate} from './utils/coordinate.js';
diff --git a/core/workspace_dragger.ts b/core/workspace_dragger.ts
index ba51b2c2c..be9efd1ca 100644
--- a/core/workspace_dragger.ts
+++ b/core/workspace_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a workspace visually.
  * @class
  */
+goog.declareModuleId('Blockly.WorkspaceDragger');
 
 import * as common from './common.js';
 import {Coordinate} from './utils/coordinate.js';
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 3d58ef111..8a60de547 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -13,6 +13,7 @@
  * Object representing a workspace rendered as SVG.
  * @class
  */
+goog.declareModuleId('Blockly.WorkspaceSvg');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/xml.ts b/core/xml.ts
index 1b644d11e..1351c24bd 100644
--- a/core/xml.ts
+++ b/core/xml.ts
@@ -13,6 +13,7 @@
  * XML reader and writer.
  * @namespace Blockly.Xml
  */
+goog.declareModuleId('Blockly.Xml');
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './comment';
diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts
index ceee8640e..feaf5c92d 100644
--- a/core/zoom_controls.ts
+++ b/core/zoom_controls.ts
@@ -13,6 +13,8 @@
  * Object representing a zoom icons.
  * @class
  */
+goog.declareModuleId('Blockly.ZoomControls');
+
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
 import './metrics_manager';