diff --git a/core/block.ts b/core/block.ts
index bd5507449..b05af07db 100644
--- a/core/block.ts
+++ b/core/block.ts
@@ -22,40 +22,31 @@ import './events/events_block_create';
 import './events/events_block_delete';
 
 import {Blocks} from './blocks';
-/* eslint-disable-next-line no-unused-vars */
-import {Comment} from './comment';
+import type {Comment} from './comment';
 import * as common from './common';
 import {Connection} from './connection';
 import {ConnectionType} from './connection_type';
 import * as constants from './constants';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockMove} from './events/events_block_move';
+import type {Abstract} from './events/events_abstract';
+import type {BlockMove} from './events/events_block_move';
 import * as eventUtils from './events/utils';
 import * as Extensions from './extensions';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import {Align, Input} from './input';
 import {inputTypes} from './input_types';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocation} from './interfaces/i_ast_node_location';
-/* eslint-disable-next-line no-unused-vars */
-import {IDeletable} from './interfaces/i_deletable';
+import type {IASTNodeLocation} from './interfaces/i_ast_node_location';
+import type {IDeletable} from './interfaces/i_deletable';
 import {ASTNode} from './keyboard_nav/ast_node';
-/* eslint-disable-next-line no-unused-vars */
-import {Mutator} from './mutator';
+import type {Mutator} from './mutator';
 import * as Tooltip from './tooltip';
 import * as arrayUtils from './utils/array';
 import {Coordinate} from './utils/coordinate';
 import * as idGenerator from './utils/idgenerator';
 import * as parsing from './utils/parsing';
 import {Size} from './utils/size';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from './variable_model';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {VariableModel} from './variable_model';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/block_animations.ts b/core/block_animations.ts
index a64990eaa..a35f4185a 100644
--- a/core/block_animations.ts
+++ b/core/block_animations.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as dom from './utils/dom';
 import {Svg} from './utils/svg';
 
diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index 2452f6686..876f5224a 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -18,25 +18,19 @@
 import './events/events_block_drag';
 
 import * as blockAnimation from './block_animations';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as bumpObjects from './bump_objects';
 import * as common from './common';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockMove} from './events/events_block_move';
+import type {BlockMove} from './events/events_block_move';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Icon} from './icon';
+import type {Icon} from './icon';
 import {InsertionMarkerManager} from './insertion_marker_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {IBlockDragger} from './interfaces/i_block_dragger';
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
+import type {IBlockDragger} from './interfaces/i_block_dragger';
+import type {IDragTarget} from './interfaces/i_drag_target';
 import * as registry from './registry';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/block_svg.ts b/core/block_svg.ts
index 832f8ff82..97919ca03 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -25,45 +25,33 @@ import './touch';
 import {Block} from './block';
 import * as blockAnimations from './block_animations';
 import * as browserEvents from './browser_events';
-/* eslint-disable-next-line no-unused-vars */
-import {Comment} from './comment';
+import type {Comment} from './comment';
 import * as common from './common';
 import {config} from './config';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from './connection';
+import type {Connection} from './connection';
 import {ConnectionType} from './connection_type';
 import * as constants from './constants';
 import * as ContextMenu from './contextmenu';
 import {ContextMenuOption, ContextMenuRegistry, LegacyContextMenuOption} from './contextmenu_registry';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockMove} from './events/events_block_move';
+import type {BlockMove} from './events/events_block_move';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Field} from './field';
 import {FieldLabel} from './field_label';
-/* eslint-disable-next-line no-unused-vars */
-import {Icon} from './icon';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from './input';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {IBoundedElement} from './interfaces/i_bounded_element';
+import type {Icon} from './icon';
+import type {Input} from './input';
+import type {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
+import type {IBoundedElement} from './interfaces/i_bounded_element';
 import {CopyData, ICopyable} from './interfaces/i_copyable';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from './interfaces/i_draggable';
+import type {IDraggable} from './interfaces/i_draggable';
 import * as internalConstants from './internal_constants';
 import {ASTNode} from './keyboard_nav/ast_node';
 import {TabNavigateCursor} from './keyboard_nav/tab_navigate_cursor';
 import {MarkerManager} from './marker_manager';
 import {Msg} from './msg';
-/* eslint-disable-next-line no-unused-vars */
-import {Mutator} from './mutator';
+import type {Mutator} from './mutator';
 import {RenderedConnection} from './rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Debug as BlockRenderingDebug} from './renderers/common/debugger';
-/* eslint-disable-next-line no-unused-vars */
-import {IPathObject} from './renderers/common/i_path_object';
+import type {Debug as BlockRenderingDebug} from './renderers/common/debugger';
+import type {IPathObject} from './renderers/common/i_path_object';
 import * as blocks from './serialization/blocks';
 import {BlockStyle} from './theme';
 import * as Tooltip from './tooltip';
@@ -72,11 +60,9 @@ import * as dom from './utils/dom';
 import {Rect} from './utils/rect';
 import {Svg} from './utils/svg';
 import * as svgMath from './utils/svg_math';
-/* eslint-disable-next-line no-unused-vars */
-import {Warning} from './warning';
+import type {Warning} from './warning';
 import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/bubble.ts b/core/bubble.ts
index 048fe0956..f30ba958a 100644
--- a/core/bubble.ts
+++ b/core/bubble.ts
@@ -20,13 +20,10 @@ import './metrics_manager';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './workspace';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockDragSurfaceSvg} from './block_drag_surface';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockDragSurfaceSvg} from './block_drag_surface';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
-/* eslint-disable-next-line no-unused-vars */
-import {IBubble} from './interfaces/i_bubble';
+import type {IBubble} from './interfaces/i_bubble';
 import {ContainerRegion} from './metrics_manager';
 import {Scrollbar} from './scrollbar';
 import * as Touch from './touch';
@@ -36,8 +33,7 @@ import * as math from './utils/math';
 import {Size} from './utils/size';
 import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts
index d07d03517..8d2f15540 100644
--- a/core/bubble_dragger.ts
+++ b/core/bubble_dragger.ts
@@ -19,23 +19,17 @@ import './bubble';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockDragSurfaceSvg} from './block_drag_surface';
+import type {BlockDragSurfaceSvg} from './block_drag_surface';
 import {ComponentManager} from './component_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentMove} from './events/events_comment_move';
+import type {CommentMove} from './events/events_comment_move';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IBubble} from './interfaces/i_bubble';
-/* eslint-disable-next-line no-unused-vars */
-import {IDeleteArea} from './interfaces/i_delete_area';
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
+import type {IBubble} from './interfaces/i_bubble';
+import type {IDeleteArea} from './interfaces/i_delete_area';
+import type {IDragTarget} from './interfaces/i_drag_target';
 import {Coordinate} from './utils/coordinate';
 import * as svgMath from './utils/svg_math';
 import {WorkspaceCommentSvg} from './workspace_comment_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/bump_objects.ts b/core/bump_objects.ts
index 1416cc52a..aa0ed59b6 100644
--- a/core/bump_objects.ts
+++ b/core/bump_objects.ts
@@ -14,25 +14,19 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
+import type {BlockSvg} from './block_svg';
+import type {Abstract} from './events/events_abstract';
 import {BlockCreate} from './events/events_block_create';
 import {BlockMove} from './events/events_block_move';
 import {CommentCreate} from './events/events_comment_create';
 import {CommentMove} from './events/events_comment_move';
-/* eslint-disable-next-line no-unused-vars */
-import {ViewportChange} from './events/events_viewport';
+import type {ViewportChange} from './events/events_viewport';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IBoundedElement} from './interfaces/i_bounded_element';
+import type {IBoundedElement} from './interfaces/i_bounded_element';
 import {ContainerRegion, MetricsManager} from './metrics_manager';
 import * as mathUtils from './utils/math';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceCommentSvg} from './workspace_comment_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceCommentSvg} from './workspace_comment_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/comment.ts b/core/comment.ts
index ed3d14802..1211ff548 100644
--- a/core/comment.ts
+++ b/core/comment.ts
@@ -28,18 +28,15 @@ import './events/events_bubble_open';
 import './warning';
 
 import {CommentModel} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import {Bubble} from './bubble';
 import * as Css from './css';
 import * as eventUtils from './events/utils';
 import {Icon} from './icon';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Size} from './utils/size';
+import type {Size} from './utils/size';
 import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
 
diff --git a/core/common.ts b/core/common.ts
index 4d834f6fa..f9cde7fe9 100644
--- a/core/common.ts
+++ b/core/common.ts
@@ -17,17 +17,12 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import {BlockDefinition, Blocks} from './blocks';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from './connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ICopyable} from './interfaces/i_copyable';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Connection} from './connection';
+import type {ICopyable} from './interfaces/i_copyable';
+import type {Workspace} from './workspace';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/component_manager.ts b/core/component_manager.ts
index cef396fbe..b60c39806 100644
--- a/core/component_manager.ts
+++ b/core/component_manager.ts
@@ -14,16 +14,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IAutoHideable} from './interfaces/i_autohideable';
-/* eslint-disable-next-line no-unused-vars */
-import {IComponent} from './interfaces/i_component';
-/* eslint-disable-next-line no-unused-vars */
-import {IDeleteArea} from './interfaces/i_delete_area';
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
-/* eslint-disable-next-line no-unused-vars */
-import {IPositionable} from './interfaces/i_positionable';
+import type {IAutoHideable} from './interfaces/i_autohideable';
+import type {IComponent} from './interfaces/i_component';
+import type {IDeleteArea} from './interfaces/i_delete_area';
+import type {IDragTarget} from './interfaces/i_drag_target';
+import type {IPositionable} from './interfaces/i_positionable';
 import * as arrayUtils from './utils/array';
 
 
diff --git a/core/connection.ts b/core/connection.ts
index bc18d6daf..898d16dce 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -17,18 +17,13 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import {ConnectionType} from './connection_type';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockMove} from './events/events_block_move';
+import type {BlockMove} from './events/events_block_move';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from './input';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationWithBlock} from './interfaces/i_ast_node_location_with_block';
-/* eslint-disable-next-line no-unused-vars */
-import {IConnectionChecker} from './interfaces/i_connection_checker';
+import type {Input} from './input';
+import type {IASTNodeLocationWithBlock} from './interfaces/i_ast_node_location_with_block';
+import type {IConnectionChecker} from './interfaces/i_connection_checker';
 import * as blocks from './serialization/blocks';
 import * as Xml from './xml';
 
diff --git a/core/connection_checker.ts b/core/connection_checker.ts
index a294d01a7..266a0f626 100644
--- a/core/connection_checker.ts
+++ b/core/connection_checker.ts
@@ -19,12 +19,10 @@
 import * as common from './common';
 import {Connection} from './connection';
 import {ConnectionType} from './connection_type';
-/* eslint-disable-next-line no-unused-vars */
-import {IConnectionChecker} from './interfaces/i_connection_checker';
+import type {IConnectionChecker} from './interfaces/i_connection_checker';
 import * as internalConstants from './internal_constants';
 import * as registry from './registry';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from './rendered_connection';
+import type {RenderedConnection} from './rendered_connection';
 
 
 /**
diff --git a/core/connection_db.ts b/core/connection_db.ts
index 8145a31c0..bd44b25bf 100644
--- a/core/connection_db.ts
+++ b/core/connection_db.ts
@@ -22,12 +22,9 @@
 import './constants';
 
 import {ConnectionType} from './connection_type';
-/* eslint-disable-next-line no-unused-vars */
-import {IConnectionChecker} from './interfaces/i_connection_checker';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from './rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {IConnectionChecker} from './interfaces/i_connection_checker';
+import type {RenderedConnection} from './rendered_connection';
+import type {Coordinate} from './utils/coordinate';
 
 
 /**
diff --git a/core/contextmenu.ts b/core/contextmenu.ts
index 6dad4c496..3a8e37c6d 100644
--- a/core/contextmenu.ts
+++ b/core/contextmenu.ts
@@ -14,10 +14,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import * as clipboard from './clipboard';
 import {config} from './config';
@@ -35,8 +33,7 @@ import * as svgMath from './utils/svg_math';
 import * as userAgent from './utils/useragent';
 import * as WidgetDiv from './widgetdiv';
 import {WorkspaceCommentSvg} from './workspace_comment_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 import * as Xml from './xml';
 
 
diff --git a/core/contextmenu_items.ts b/core/contextmenu_items.ts
index b50f52a74..3780869b1 100644
--- a/core/contextmenu_items.ts
+++ b/core/contextmenu_items.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as clipboard from './clipboard';
 import {ContextMenuRegistry, RegistryItem, Scope} from './contextmenu_registry';
 import * as dialog from './dialog';
@@ -25,8 +24,7 @@ import {inputTypes} from './input_types';
 import {Msg} from './msg';
 import * as idGenerator from './utils/idgenerator';
 import * as userAgent from './utils/useragent';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/contextmenu_registry.ts b/core/contextmenu_registry.ts
index 698460ff1..07df61c3c 100644
--- a/core/contextmenu_registry.ts
+++ b/core/contextmenu_registry.ts
@@ -14,10 +14,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {BlockSvg} from './block_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/delete_area.ts b/core/delete_area.ts
index 541ad9f2c..d2c042287 100644
--- a/core/delete_area.ts
+++ b/core/delete_area.ts
@@ -18,10 +18,8 @@
 
 import {BlockSvg} from './block_svg';
 import {DragTarget} from './drag_target';
-/* eslint-disable-next-line no-unused-vars */
-import {IDeleteArea} from './interfaces/i_delete_area';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from './interfaces/i_draggable';
+import type {IDeleteArea} from './interfaces/i_delete_area';
+import type {IDraggable} from './interfaces/i_draggable';
 
 
 /**
diff --git a/core/drag_target.ts b/core/drag_target.ts
index ad127e427..76dcfc2ce 100644
--- a/core/drag_target.ts
+++ b/core/drag_target.ts
@@ -16,12 +16,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from './interfaces/i_draggable';
-/* eslint-disable-next-line no-unused-vars */
-import {Rect} from './utils/rect';
+import type {IDragTarget} from './interfaces/i_drag_target';
+import type {IDraggable} from './interfaces/i_draggable';
+import type {Rect} from './utils/rect';
 
 
 /**
diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts
index 3ce004a9d..f3d8a6a9d 100644
--- a/core/dropdowndiv.ts
+++ b/core/dropdowndiv.ts
@@ -16,19 +16,15 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as common from './common';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Field} from './field';
 import * as dom from './utils/dom';
 import * as math from './utils/math';
 import {Rect} from './utils/rect';
-/* eslint-disable-next-line no-unused-vars */
-import {Size} from './utils/size';
+import type {Size} from './utils/size';
 import * as style from './utils/style';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/events/events_abstract.ts b/core/events/events_abstract.ts
index 694930594..6bc0dffae 100644
--- a/core/events/events_abstract.ts
+++ b/core/events/events_abstract.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from '../workspace';
+import type {Workspace} from '../workspace';
 
 import * as eventUtils from './utils';
 
diff --git a/core/events/events_block_base.ts b/core/events/events_block_base.ts
index 88f674cf4..d2b33d7b1 100644
--- a/core/events/events_block_base.ts
+++ b/core/events/events_block_base.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 
 import {Abstract as AbstractEvent} from './events_abstract';
 
diff --git a/core/events/events_block_change.ts b/core/events/events_block_change.ts
index 506da71c2..3db7d9a93 100644
--- a/core/events/events_block_change.ts
+++ b/core/events/events_block_change.ts
@@ -14,10 +14,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../block_svg';
+import type {Block} from '../block';
+import type {BlockSvg} from '../block_svg';
 import * as registry from '../registry';
 import * as Xml from '../xml';
 
diff --git a/core/events/events_block_create.ts b/core/events/events_block_create.ts
index 9a66c567f..1acd59e70 100644
--- a/core/events/events_block_create.ts
+++ b/core/events/events_block_create.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 import * as blocks from '../serialization/blocks';
 import * as Xml from '../xml';
diff --git a/core/events/events_block_delete.ts b/core/events/events_block_delete.ts
index ce67b44af..008eebc22 100644
--- a/core/events/events_block_delete.ts
+++ b/core/events/events_block_delete.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 import * as blocks from '../serialization/blocks';
 import * as Xml from '../xml';
diff --git a/core/events/events_block_drag.ts b/core/events/events_block_drag.ts
index 7ddb5a03c..e4b34f664 100644
--- a/core/events/events_block_drag.ts
+++ b/core/events/events_block_drag.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 
 import {UiBase} from './events_ui_base';
diff --git a/core/events/events_block_move.ts b/core/events/events_block_move.ts
index 5a1a22318..36016423a 100644
--- a/core/events/events_block_move.ts
+++ b/core/events/events_block_move.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import {ConnectionType} from '../connection_type';
 import * as registry from '../registry';
 import {Coordinate} from '../utils/coordinate';
diff --git a/core/events/events_bubble_open.ts b/core/events/events_bubble_open.ts
index adca6f8a7..32c2070ba 100644
--- a/core/events/events_bubble_open.ts
+++ b/core/events/events_bubble_open.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../block_svg';
+import type {BlockSvg} from '../block_svg';
 import * as registry from '../registry';
 
 import {UiBase} from './events_ui_base';
diff --git a/core/events/events_click.ts b/core/events/events_click.ts
index 1d7e38a55..b7519df51 100644
--- a/core/events/events_click.ts
+++ b/core/events/events_click.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 
 import {UiBase} from './events_ui_base';
diff --git a/core/events/events_comment_base.ts b/core/events/events_comment_base.ts
index 26aaa8786..4f4292b98 100644
--- a/core/events/events_comment_base.ts
+++ b/core/events/events_comment_base.ts
@@ -15,15 +15,12 @@
 
 
 import * as utilsXml from '../utils/xml';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from '../workspace_comment';
+import type {WorkspaceComment} from '../workspace_comment';
 import * as Xml from '../xml';
 
 import {Abstract as AbstractEvent} from './events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentCreate} from './events_comment_create';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentDelete} from './events_comment_delete';
+import type {CommentCreate} from './events_comment_create';
+import type {CommentDelete} from './events_comment_delete';
 import * as eventUtils from './utils';
 
 
diff --git a/core/events/events_comment_change.ts b/core/events/events_comment_change.ts
index 33e5bb7ba..5749dc21b 100644
--- a/core/events/events_comment_change.ts
+++ b/core/events/events_comment_change.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from '../workspace_comment';
+import type {WorkspaceComment} from '../workspace_comment';
 
 import {CommentBase} from './events_comment_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_comment_create.ts b/core/events/events_comment_create.ts
index 735148d3d..d1d053460 100644
--- a/core/events/events_comment_create.ts
+++ b/core/events/events_comment_create.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from '../workspace_comment';
+import type {WorkspaceComment} from '../workspace_comment';
 import * as Xml from '../xml';
 
 import {CommentBase} from './events_comment_base';
diff --git a/core/events/events_comment_delete.ts b/core/events/events_comment_delete.ts
index f7b471d7d..9b2d532f2 100644
--- a/core/events/events_comment_delete.ts
+++ b/core/events/events_comment_delete.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from '../workspace_comment';
+import type {WorkspaceComment} from '../workspace_comment';
 
 import {CommentBase} from './events_comment_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_comment_move.ts b/core/events/events_comment_move.ts
index 7ad759bef..d69278dbd 100644
--- a/core/events/events_comment_move.ts
+++ b/core/events/events_comment_move.ts
@@ -16,8 +16,7 @@
 
 import * as registry from '../registry';
 import {Coordinate} from '../utils/coordinate';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from '../workspace_comment';
+import type {WorkspaceComment} from '../workspace_comment';
 
 import {CommentBase} from './events_comment_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_marker_move.ts b/core/events/events_marker_move.ts
index 9e712c609..c57295f56 100644
--- a/core/events/events_marker_move.ts
+++ b/core/events/events_marker_move.ts
@@ -14,12 +14,10 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import {ASTNode} from '../keyboard_nav/ast_node';
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from '../workspace';
+import type {Workspace} from '../workspace';
 
 import {UiBase} from './events_ui_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_ui.ts b/core/events/events_ui.ts
index 755c3b6d6..cfcb441ea 100644
--- a/core/events/events_ui.ts
+++ b/core/events/events_ui.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 
 import {UiBase} from './events_ui_base';
diff --git a/core/events/events_var_base.ts b/core/events/events_var_base.ts
index 1edc934ea..f15f175a3 100644
--- a/core/events/events_var_base.ts
+++ b/core/events/events_var_base.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from '../variable_model';
+import type {VariableModel} from '../variable_model';
 
 import {Abstract as AbstractEvent} from './events_abstract';
 
diff --git a/core/events/events_var_create.ts b/core/events/events_var_create.ts
index 7eccf05e5..03bae144a 100644
--- a/core/events/events_var_create.ts
+++ b/core/events/events_var_create.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from '../variable_model';
+import type {VariableModel} from '../variable_model';
 
 import {VarBase} from './events_var_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts
index 735012356..baf68082d 100644
--- a/core/events/events_var_delete.ts
+++ b/core/events/events_var_delete.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from '../variable_model';
+import type {VariableModel} from '../variable_model';
 
 import {VarBase} from './events_var_base';
 import * as eventUtils from './utils';
diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts
index a82488d39..3ff99fc25 100644
--- a/core/events/events_var_rename.ts
+++ b/core/events/events_var_rename.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from '../variable_model';
+import type {VariableModel} from '../variable_model';
 
 import {VarBase} from './events_var_base';
 import * as eventUtils from './utils';
diff --git a/core/events/utils.ts b/core/events/utils.ts
index 125c2c878..49f3f72c9 100644
--- a/core/events/utils.ts
+++ b/core/events/utils.ts
@@ -16,29 +16,19 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 import * as registry from '../registry';
 import * as idGenerator from '../utils/idgenerator';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from '../workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type {Workspace} from '../workspace';
+import type {WorkspaceSvg} from '../workspace_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockChange} from './events_block_change';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockCreate} from './events_block_create';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockMove} from './events_block_move';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentCreate} from './events_comment_create';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentMove} from './events_comment_move';
-/* eslint-disable-next-line no-unused-vars */
-import {ViewportChange} from './events_viewport';
+import type {Abstract} from './events_abstract';
+import type {BlockChange} from './events_block_change';
+import type {BlockCreate} from './events_block_create';
+import type {BlockMove} from './events_block_move';
+import type {CommentCreate} from './events_comment_create';
+import type {CommentMove} from './events_comment_move';
+import type {ViewportChange} from './events_viewport';
 
 
 /** Group ID for new events.  Grouped events are indivisible. */
diff --git a/core/events/workspace_events.ts b/core/events/workspace_events.ts
index 7bfe73633..0eebf51bb 100644
--- a/core/events/workspace_events.ts
+++ b/core/events/workspace_events.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from '../workspace';
+import type {Workspace} from '../workspace';
 
 import {Abstract as AbstractEvent} from './events_abstract';
 import * as eventUtils from './utils';
diff --git a/core/extensions.ts b/core/extensions.ts
index 45f5e4795..8cbe6015d 100644
--- a/core/extensions.ts
+++ b/core/extensions.ts
@@ -23,8 +23,7 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './mutator';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import {BlockSvg} from './block_svg';
 import {FieldDropdown} from './field_dropdown';
 import {Mutator} from './mutator';
diff --git a/core/field.ts b/core/field.ts
index 71023f222..da8f4c6ec 100644
--- a/core/field.ts
+++ b/core/field.ts
@@ -26,30 +26,21 @@ import './events/events_block_change';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './gesture';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import * as dropDownDiv from './dropdowndiv';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from './input';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationWithBlock} from './interfaces/i_ast_node_location_with_block';
-/* eslint-disable-next-line no-unused-vars */
-import {IKeyboardAccessible} from './interfaces/i_keyboard_accessible';
-/* eslint-disable-next-line no-unused-vars */
-import {IRegistrable} from './interfaces/i_registrable';
+import type {Input} from './input';
+import type {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
+import type {IASTNodeLocationWithBlock} from './interfaces/i_ast_node_location_with_block';
+import type {IKeyboardAccessible} from './interfaces/i_keyboard_accessible';
+import type {IRegistrable} from './interfaces/i_registrable';
 import {MarkerManager} from './marker_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './renderers/common/constants';
+import type {ConstantProvider} from './renderers/common/constants';
 import {KeyboardShortcut} from './shortcut_registry';
 import * as Tooltip from './tooltip';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import * as parsing from './utils/parsing';
 import {Rect} from './utils/rect';
@@ -60,8 +51,7 @@ import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
 import * as utilsXml from './utils/xml';
 import * as WidgetDiv from './widgetdiv';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 import * as Xml from './xml';
 
 
diff --git a/core/field_angle.ts b/core/field_angle.ts
index f89cc9f4a..2521f70a7 100644
--- a/core/field_angle.ts
+++ b/core/field_angle.ts
@@ -24,8 +24,7 @@ import {FieldTextInput} from './field_textinput';
 import * as dom from './utils/dom';
 import {KeyCodes} from './utils/keycodes';
 import * as math from './utils/math';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
 import * as WidgetDiv from './widgetdiv';
diff --git a/core/field_checkbox.ts b/core/field_checkbox.ts
index e028ae2b3..0a2ba28f3 100644
--- a/core/field_checkbox.ts
+++ b/core/field_checkbox.ts
@@ -20,8 +20,7 @@ import './events/events_block_change';
 import {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 
 
 /**
diff --git a/core/field_colour.ts b/core/field_colour.ts
index 9e5ab566d..90dbe8c0c 100644
--- a/core/field_colour.ts
+++ b/core/field_colour.ts
@@ -28,8 +28,7 @@ import * as colour from './utils/colour';
 import * as dom from './utils/dom';
 import * as idGenerator from './utils/idgenerator';
 import {KeyCodes} from './utils/keycodes';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import {Size} from './utils/size';
 
 
diff --git a/core/field_dropdown.ts b/core/field_dropdown.ts
index c4fb28cad..0df677791 100644
--- a/core/field_dropdown.ts
+++ b/core/field_dropdown.ts
@@ -18,8 +18,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as dropDownDiv from './dropdowndiv';
 import {Field} from './field';
 import * as fieldRegistry from './field_registry';
@@ -29,8 +28,7 @@ import * as aria from './utils/aria';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import * as utilsString from './utils/string';
 import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
diff --git a/core/field_image.ts b/core/field_image.ts
index 80cabec57..7c67ab064 100644
--- a/core/field_image.ts
+++ b/core/field_image.ts
@@ -18,8 +18,7 @@ import {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import * as dom from './utils/dom';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import {Size} from './utils/size';
 import {Svg} from './utils/svg';
 
diff --git a/core/field_label.ts b/core/field_label.ts
index a66aa66a7..eb80e7fa3 100644
--- a/core/field_label.ts
+++ b/core/field_label.ts
@@ -20,8 +20,7 @@ import {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import * as dom from './utils/dom';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 
 
 /**
diff --git a/core/field_multilineinput.ts b/core/field_multilineinput.ts
index e8badf853..a5297d225 100644
--- a/core/field_multilineinput.ts
+++ b/core/field_multilineinput.ts
@@ -22,8 +22,7 @@ import * as aria from './utils/aria';
 import * as dom from './utils/dom';
 import {KeyCodes} from './utils/keycodes';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import {Svg} from './utils/svg';
 import * as userAgent from './utils/useragent';
 import * as WidgetDiv from './widgetdiv';
diff --git a/core/field_number.ts b/core/field_number.ts
index d3913f2dc..47483b5a7 100644
--- a/core/field_number.ts
+++ b/core/field_number.ts
@@ -18,8 +18,7 @@ import {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import {FieldTextInput} from './field_textinput';
 import * as aria from './utils/aria';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 
 
 /**
diff --git a/core/field_registry.ts b/core/field_registry.ts
index ae50931d6..c6856c13e 100644
--- a/core/field_registry.ts
+++ b/core/field_registry.ts
@@ -18,10 +18,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
-/* eslint-disable-next-line no-unused-vars */
-import {IRegistrableField} from './interfaces/i_registrable_field';
+import type {Field} from './field';
+import type {IRegistrableField} from './interfaces/i_registrable_field';
 import * as registry from './registry';
 
 
diff --git a/core/field_textinput.ts b/core/field_textinput.ts
index f9e7b4288..4a064d0f6 100644
--- a/core/field_textinput.ts
+++ b/core/field_textinput.ts
@@ -17,8 +17,7 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import * as dialog from './dialog';
 import * as dropDownDiv from './dropdowndiv';
@@ -31,12 +30,10 @@ import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {KeyCodes} from './utils/keycodes';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import * as userAgent from './utils/useragent';
 import * as WidgetDiv from './widgetdiv';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/field_variable.ts b/core/field_variable.ts
index 94ac7d20d..e1e27de14 100644
--- a/core/field_variable.ts
+++ b/core/field_variable.ts
@@ -17,20 +17,16 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import {Field} from './field';
 import {FieldDropdown} from './field_dropdown';
 import * as fieldRegistry from './field_registry';
 import * as internalConstants from './internal_constants';
-/* eslint-disable-next-line no-unused-vars */
-import {Menu} from './menu';
-/* eslint-disable-next-line no-unused-vars */
-import {MenuItem} from './menuitem';
+import type {Menu} from './menu';
+import type {MenuItem} from './menuitem';
 import {Msg} from './msg';
 import * as parsing from './utils/parsing';
-/* eslint-disable-next-line no-unused-vars */
-import {Sentinel} from './utils/sentinel';
+import type {Sentinel} from './utils/sentinel';
 import {Size} from './utils/size';
 import {VariableModel} from './variable_model';
 import * as Variables from './variables';
diff --git a/core/flyout_base.ts b/core/flyout_base.ts
index 3c2c246fc..03db1b2ce 100644
--- a/core/flyout_base.ts
+++ b/core/flyout_base.ts
@@ -14,10 +14,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import * as common from './common';
 import {ComponentManager} from './component_manager';
@@ -25,14 +23,11 @@ import {DeleteArea} from './delete_area';
 import * as BlockCreate from './events/events_block_create';
 import * as VarCreate from './events/events_var_create';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {FlyoutButton} from './flyout_button';
+import type {FlyoutButton} from './flyout_button';
 import {FlyoutMetricsManager} from './flyout_metrics_manager';
 import * as Gesture from './gesture';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {Options} from './options';
+import type {IFlyout} from './interfaces/i_flyout';
+import type {Options} from './options';
 import * as blockRendering from './renderers/common/block_rendering';
 import {ScrollbarPair} from './scrollbar_pair';
 import * as blocks from './serialization/blocks';
@@ -41,8 +36,7 @@ import * as Touch from './touch';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import * as idGenerator from './utils/idgenerator';
-/* eslint-disable-next-line no-unused-vars */
-import {Rect} from './utils/rect';
+import type {Rect} from './utils/rect';
 import {Svg} from './utils/svg';
 import * as toolbox from './utils/toolbox';
 import * as Variables from './variables';
diff --git a/core/flyout_button.ts b/core/flyout_button.ts
index b5858e446..8428ae149 100644
--- a/core/flyout_button.ts
+++ b/core/flyout_button.ts
@@ -21,10 +21,8 @@ import * as dom from './utils/dom';
 import * as parsing from './utils/parsing';
 import * as style from './utils/style';
 import {Svg} from './utils/svg';
-/* eslint-disable-next-line no-unused-vars */
-import * as toolbox from './utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type * as toolbox from './utils/toolbox';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts
index f3de1acf8..f2d930bb6 100644
--- a/core/flyout_horizontal.ts
+++ b/core/flyout_horizontal.ts
@@ -17,14 +17,11 @@
 import * as browserEvents from './browser_events';
 import * as dropDownDiv from './dropdowndiv';
 import {Flyout, FlyoutItem} from './flyout_base';
-/* eslint-disable-next-line no-unused-vars */
-import {FlyoutButton} from './flyout_button';
-/* eslint-disable-next-line no-unused-vars */
-import {Options} from './options';
+import type {FlyoutButton} from './flyout_button';
+import type {Options} from './options';
 import * as registry from './registry';
 import {Scrollbar} from './scrollbar';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import {Rect} from './utils/rect';
 import * as toolbox from './utils/toolbox';
 import * as WidgetDiv from './widgetdiv';
diff --git a/core/flyout_metrics_manager.ts b/core/flyout_metrics_manager.ts
index 3ed551d1b..187d9eebf 100644
--- a/core/flyout_metrics_manager.ts
+++ b/core/flyout_metrics_manager.ts
@@ -14,11 +14,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
+import type {IFlyout} from './interfaces/i_flyout';
 import {ContainerRegion, MetricsManager} from './metrics_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts
index 01a525421..f7224e5c3 100644
--- a/core/flyout_vertical.ts
+++ b/core/flyout_vertical.ts
@@ -22,14 +22,11 @@ import './constants';
 import * as browserEvents from './browser_events';
 import * as dropDownDiv from './dropdowndiv';
 import {Flyout, FlyoutItem} from './flyout_base';
-/* eslint-disable-next-line no-unused-vars */
-import {FlyoutButton} from './flyout_button';
-/* eslint-disable-next-line no-unused-vars */
-import {Options} from './options';
+import type {FlyoutButton} from './flyout_button';
+import type {Options} from './options';
 import * as registry from './registry';
 import {Scrollbar} from './scrollbar';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import {Rect} from './utils/rect';
 import * as toolbox from './utils/toolbox';
 import * as WidgetDiv from './widgetdiv';
diff --git a/core/generator.ts b/core/generator.ts
index 7367b7a0a..d5fd8281a 100644
--- a/core/generator.ts
+++ b/core/generator.ts
@@ -16,14 +16,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import * as common from './common';
-/* eslint-disable-next-line no-unused-vars */
-import {Names, NameType} from './names';
+import type {Names, NameType} from './names';
 import * as deprecation from './utils/deprecation';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/gesture.ts b/core/gesture.ts
index ce2d63a9a..0a6dd3365 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -22,32 +22,25 @@ import './block_dragger';
 import './events/events_click';
 
 import * as blockAnimations from './block_animations';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
 import {BubbleDragger} from './bubble_dragger';
 import * as common from './common';
 import {config} from './config';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
-/* eslint-disable-next-line no-unused-vars */
-import {IBlockDragger} from './interfaces/i_block_dragger';
-/* eslint-disable-next-line no-unused-vars */
-import {IBubble} from './interfaces/i_bubble';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
+import type {Field} from './field';
+import type {IBlockDragger} from './interfaces/i_block_dragger';
+import type {IBubble} from './interfaces/i_bubble';
+import type {IFlyout} from './interfaces/i_flyout';
 import * as internalConstants from './internal_constants';
 import * as registry from './registry';
 import * as Tooltip from './tooltip';
 import * as Touch from './touch';
 import {Coordinate} from './utils/coordinate';
 import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceCommentSvg} from './workspace_comment_svg';
+import type {WorkspaceCommentSvg} from './workspace_comment_svg';
 import {WorkspaceDragger} from './workspace_dragger';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/icon.ts b/core/icon.ts
index 246ceb443..3866cca7a 100644
--- a/core/icon.ts
+++ b/core/icon.ts
@@ -14,11 +14,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
-/* eslint-disable-next-line no-unused-vars */
-import {Bubble} from './bubble';
+import type {Bubble} from './bubble';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {Size} from './utils/size';
diff --git a/core/inject.ts b/core/inject.ts
index dc34189c1..4010d6783 100644
--- a/core/inject.ts
+++ b/core/inject.ts
@@ -15,8 +15,7 @@
 
 
 import {BlockDragSurfaceSvg} from './block_drag_surface';
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
+import type {BlocklyOptions} from './blockly_options';
 import * as browserEvents from './browser_events';
 import * as bumpObjects from './bump_objects';
 import * as common from './common';
diff --git a/core/input.ts b/core/input.ts
index 6f8df96f4..efe758346 100644
--- a/core/input.ts
+++ b/core/input.ts
@@ -17,18 +17,13 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './field_label';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from './connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
+import type {Connection} from './connection';
+import type {Field} from './field';
 import * as fieldRegistry from './field_registry';
 import {inputTypes} from './input_types';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from './rendered_connection';
+import type {RenderedConnection} from './rendered_connection';
 
 
 /**
diff --git a/core/insertion_marker_manager.ts b/core/insertion_marker_manager.ts
index 67bfc01f5..bf69ca0dd 100644
--- a/core/insertion_marker_manager.ts
+++ b/core/insertion_marker_manager.ts
@@ -15,24 +15,18 @@
 
 
 import * as blockAnimations from './block_animations';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import * as common from './common';
 import {ComponentManager} from './component_manager';
 import {config} from './config';
 import {ConnectionType} from './connection_type';
 import * as constants from './constants';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IDeleteArea} from './interfaces/i_delete_area';
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from './rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {IDeleteArea} from './interfaces/i_delete_area';
+import type {IDragTarget} from './interfaces/i_drag_target';
+import type {RenderedConnection} from './rendered_connection';
+import type {Coordinate} from './utils/coordinate';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /** Represents a nearby valid connection. */
diff --git a/core/interfaces/i_ast_node_location_svg.ts b/core/interfaces/i_ast_node_location_svg.ts
index 5b9949737..ca05e4def 100644
--- a/core/interfaces/i_ast_node_location_svg.ts
+++ b/core/interfaces/i_ast_node_location_svg.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocation} from './i_ast_node_location';
+import type {IASTNodeLocation} from './i_ast_node_location';
 
 
 /**
diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts
index bd11bc191..fbf283330 100644
--- a/core/interfaces/i_ast_node_location_with_block.ts
+++ b/core/interfaces/i_ast_node_location_with_block.ts
@@ -20,8 +20,7 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../block';
 
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocation} from './i_ast_node_location';
+import type {IASTNodeLocation} from './i_ast_node_location';
 
 
 /**
diff --git a/core/interfaces/i_autohideable.ts b/core/interfaces/i_autohideable.ts
index 6f08b2846..f8168a9d8 100644
--- a/core/interfaces/i_autohideable.ts
+++ b/core/interfaces/i_autohideable.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IComponent} from './i_component';
+import type {IComponent} from './i_component';
 
 
 /**
diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts
index 652fbd881..68cabad40 100644
--- a/core/interfaces/i_bubble.ts
+++ b/core/interfaces/i_bubble.ts
@@ -21,10 +21,8 @@ import '../block_drag_surface';
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../utils/coordinate';
 
-/* eslint-disable-next-line no-unused-vars */
-import {IContextMenu} from './i_contextmenu';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from './i_draggable';
+import type {IContextMenu} from './i_contextmenu';
+import type {IDraggable} from './i_draggable';
 
 
 /**
diff --git a/core/interfaces/i_copyable.ts b/core/interfaces/i_copyable.ts
index d6c0e9be5..7b2381fb4 100644
--- a/core/interfaces/i_copyable.ts
+++ b/core/interfaces/i_copyable.ts
@@ -15,8 +15,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type {WorkspaceSvg} from '../workspace_svg';
 
 import {ISelectable} from './i_selectable';
 
diff --git a/core/interfaces/i_draggable.ts b/core/interfaces/i_draggable.ts
index d209c9a44..9744ab5c7 100644
--- a/core/interfaces/i_draggable.ts
+++ b/core/interfaces/i_draggable.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IDeletable} from './i_deletable';
+import type {IDeletable} from './i_deletable';
 
 
 /**
diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts
index 95a7adff4..972497bf4 100644
--- a/core/interfaces/i_flyout.ts
+++ b/core/interfaces/i_flyout.ts
@@ -27,11 +27,9 @@ import '../utils/coordinate';
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../utils/svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type {WorkspaceSvg} from '../workspace_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {IRegistrable} from './i_registrable';
+import type {IRegistrable} from './i_registrable';
 
 
 /**
diff --git a/core/interfaces/i_registrable_field.ts b/core/interfaces/i_registrable_field.ts
index 64e9bc6d7..80220117f 100644
--- a/core/interfaces/i_registrable_field.ts
+++ b/core/interfaces/i_registrable_field.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../field';
+import type {Field} from '../field';
 
 
 type fromJson = (p1: object) => Field;
diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts
index bce18972b..1f34cfdc7 100644
--- a/core/interfaces/i_selectable_toolbox_item.ts
+++ b/core/interfaces/i_selectable_toolbox_item.ts
@@ -18,8 +18,7 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../utils/toolbox';
 
-/* eslint-disable-next-line no-unused-vars */
-import {IToolboxItem} from './i_toolbox_item';
+import type {IToolboxItem} from './i_toolbox_item';
 
 
 /**
diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts
index 8e2459103..23f98f17a 100644
--- a/core/interfaces/i_toolbox.ts
+++ b/core/interfaces/i_toolbox.ts
@@ -27,8 +27,7 @@ import './i_toolbox_item';
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../workspace_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {IRegistrable} from './i_registrable';
+import type {IRegistrable} from './i_registrable';
 
 
 /**
diff --git a/core/keyboard_nav/ast_node.ts b/core/keyboard_nav/ast_node.ts
index 54875d91f..64fbd9d79 100644
--- a/core/keyboard_nav/ast_node.ts
+++ b/core/keyboard_nav/ast_node.ts
@@ -16,22 +16,15 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from '../connection';
+import type {Block} from '../block';
+import type {Connection} from '../connection';
 import {ConnectionType} from '../connection_type';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../field';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../input';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocation} from '../interfaces/i_ast_node_location';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationWithBlock} from '../interfaces/i_ast_node_location_with_block';
+import type {Field} from '../field';
+import type {Input} from '../input';
+import type {IASTNodeLocation} from '../interfaces/i_ast_node_location';
+import type {IASTNodeLocationWithBlock} from '../interfaces/i_ast_node_location_with_block';
 import {Coordinate} from '../utils/coordinate';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from '../workspace';
+import type {Workspace} from '../workspace';
 
 
 /**
diff --git a/core/keyboard_nav/marker.ts b/core/keyboard_nav/marker.ts
index 2b32fdb31..7479eaa80 100644
--- a/core/keyboard_nav/marker.ts
+++ b/core/keyboard_nav/marker.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {MarkerSvg} from '../renderers/common/marker_svg';
+import type {MarkerSvg} from '../renderers/common/marker_svg';
 
 import {ASTNode} from './ast_node';
 
diff --git a/core/keyboard_nav/tab_navigate_cursor.ts b/core/keyboard_nav/tab_navigate_cursor.ts
index 28c1cc4d6..3deded4e5 100644
--- a/core/keyboard_nav/tab_navigate_cursor.ts
+++ b/core/keyboard_nav/tab_navigate_cursor.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../field';
+import type {Field} from '../field';
 
 import {ASTNode} from './ast_node';
 import {BasicCursor} from './basic_cursor';
diff --git a/core/marker_manager.ts b/core/marker_manager.ts
index 07312de04..ac98a4fdb 100644
--- a/core/marker_manager.ts
+++ b/core/marker_manager.ts
@@ -14,12 +14,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Cursor} from './keyboard_nav/cursor';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from './keyboard_nav/marker';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Cursor} from './keyboard_nav/cursor';
+import type {Marker} from './keyboard_nav/marker';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/menu.ts b/core/menu.ts
index 749ab9123..88f7ae8ec 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -15,14 +15,12 @@
 
 
 import * as browserEvents from './browser_events';
-/* eslint-disable-next-line no-unused-vars */
-import {MenuItem} from './menuitem';
+import type {MenuItem} from './menuitem';
 import * as aria from './utils/aria';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {KeyCodes} from './utils/keycodes';
-/* eslint-disable-next-line no-unused-vars */
-import {Size} from './utils/size';
+import type {Size} from './utils/size';
 import * as style from './utils/style';
 
 
diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts
index a8f252884..7d5f826ba 100644
--- a/core/metrics_manager.ts
+++ b/core/metrics_manager.ts
@@ -14,19 +14,14 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {IMetricsManager} from './interfaces/i_metrics_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from './interfaces/i_toolbox';
+import type {IFlyout} from './interfaces/i_flyout';
+import type {IMetricsManager} from './interfaces/i_metrics_manager';
+import type {IToolbox} from './interfaces/i_toolbox';
 import * as registry from './registry';
-/* eslint-disable-next-line no-unused-vars */
-import {Metrics} from './utils/metrics';
+import type {Metrics} from './utils/metrics';
 import {Size} from './utils/size';
 import * as toolboxUtils from './utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/mutator.ts b/core/mutator.ts
index a56152f3f..cd849f64c 100644
--- a/core/mutator.ts
+++ b/core/mutator.ts
@@ -19,24 +19,18 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
+import type {BlocklyOptions} from './blockly_options';
 import {Bubble} from './bubble';
 import {config} from './config';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from './connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
+import type {Connection} from './connection';
+import type {Abstract} from './events/events_abstract';
 import {BlockChange} from './events/events_block_change';
 import * as eventUtils from './events/utils';
 import {Icon} from './icon';
 import {Options} from './options';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {Svg} from './utils/svg';
 import * as toolbox from './utils/toolbox';
diff --git a/core/names.ts b/core/names.ts
index 590251b0f..443e24ddd 100644
--- a/core/names.ts
+++ b/core/names.ts
@@ -19,11 +19,9 @@ import './procedures';
 
 import {Msg} from './msg';
 import * as Procedures from './procedures';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableMap} from './variable_map';
+import type {VariableMap} from './variable_map';
 import * as Variables from './variables';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/options.ts b/core/options.ts
index b5d808b6f..aaac96f1d 100644
--- a/core/options.ts
+++ b/core/options.ts
@@ -14,17 +14,14 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
+import type {BlocklyOptions} from './blockly_options';
 import * as registry from './registry';
 import {Theme} from './theme';
 import {Classic} from './theme/classic';
 import * as idGenerator from './utils/idgenerator';
-/* eslint-disable-next-line no-unused-vars */
-import {Metrics} from './utils/metrics';
+import type {Metrics} from './utils/metrics';
 import * as toolbox from './utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts
index 085c20cfe..7b0d00015 100644
--- a/core/positionable_helpers.ts
+++ b/core/positionable_helpers.ts
@@ -21,11 +21,9 @@ import './metrics_manager';
 import {UiMetrics} from './metrics_manager';
 import {Scrollbar} from './scrollbar';
 import {Rect} from './utils/rect';
-/* eslint-disable-next-line no-unused-vars */
-import {Size} from './utils/size';
+import type {Size} from './utils/size';
 import * as toolbox from './utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/procedures.ts b/core/procedures.ts
index b2005d5b5..d0a7c4a2e 100644
--- a/core/procedures.ts
+++ b/core/procedures.ts
@@ -17,25 +17,19 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
 import {Blocks} from './blocks';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {BubbleOpen} from './events/events_bubble_open';
+import type {Abstract} from './events/events_abstract';
+import type {BubbleOpen} from './events/events_bubble_open';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Field} from './field';
 import {Msg} from './msg';
 import {Names} from './names';
 import * as utilsXml from './utils/xml';
 import * as Variables from './variables';
 import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 import * as Xml from './xml';
 
 
diff --git a/core/registry.ts b/core/registry.ts
index dfe92f6ff..879bb08fc 100644
--- a/core/registry.ts
+++ b/core/registry.ts
@@ -16,32 +16,19 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
-/* eslint-disable-next-line no-unused-vars */
-import {IBlockDragger} from './interfaces/i_block_dragger';
-/* eslint-disable-next-line no-unused-vars */
-import {IConnectionChecker} from './interfaces/i_connection_checker';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {IMetricsManager} from './interfaces/i_metrics_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {ISerializer} from './interfaces/i_serializer';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from './interfaces/i_toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {Cursor} from './keyboard_nav/cursor';
-/* eslint-disable-next-line no-unused-vars */
-import {Options} from './options';
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderers/common/renderer';
-/* eslint-disable-next-line no-unused-vars */
-import {Theme} from './theme';
-/* eslint-disable-next-line no-unused-vars */
-import {ToolboxItem} from './toolbox/toolbox_item';
+import type {Abstract} from './events/events_abstract';
+import type {Field} from './field';
+import type {IBlockDragger} from './interfaces/i_block_dragger';
+import type {IConnectionChecker} from './interfaces/i_connection_checker';
+import type {IFlyout} from './interfaces/i_flyout';
+import type {IMetricsManager} from './interfaces/i_metrics_manager';
+import type {ISerializer} from './interfaces/i_serializer';
+import type {IToolbox} from './interfaces/i_toolbox';
+import type {Cursor} from './keyboard_nav/cursor';
+import type {Options} from './options';
+import type {Renderer} from './renderers/common/renderer';
+import type {Theme} from './theme';
+import type {ToolboxItem} from './toolbox/toolbox_item';
 
 
 /**
diff --git a/core/rendered_connection.ts b/core/rendered_connection.ts
index feba8519b..e4286ca6c 100644
--- a/core/rendered_connection.ts
+++ b/core/rendered_connection.ts
@@ -14,15 +14,12 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
 import * as common from './common';
 import {config} from './config';
 import {Connection} from './connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ConnectionDB} from './connection_db';
+import type {ConnectionDB} from './connection_db';
 import {ConnectionType} from './connection_type';
 import * as eventUtils from './events/utils';
 import * as internalConstants from './internal_constants';
diff --git a/core/renderers/common/block_rendering.ts b/core/renderers/common/block_rendering.ts
index 3a7743e62..4bbe416ff 100644
--- a/core/renderers/common/block_rendering.ts
+++ b/core/renderers/common/block_rendering.ts
@@ -15,8 +15,7 @@
 
 
 import * as registry from '../../registry';
-/* eslint-disable-next-line no-unused-vars */
-import {Theme} from '../../theme';
+import type {Theme} from '../../theme';
 import * as deprecation from '../../utils/deprecation';
 import {Measurable} from '../measurables/base';
 import {BottomRow} from '../measurables/bottom_row';
diff --git a/core/renderers/common/constants.ts b/core/renderers/common/constants.ts
index f0047736b..5209bce75 100644
--- a/core/renderers/common/constants.ts
+++ b/core/renderers/common/constants.ts
@@ -15,8 +15,7 @@
 
 
 import {ConnectionType} from '../../connection_type';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {RenderedConnection} from '../../rendered_connection';
 import {BlockStyle, Theme} from '../../theme';
 import * as colour from '../../utils/colour';
 import * as dom from '../../utils/dom';
diff --git a/core/renderers/common/debugger.ts b/core/renderers/common/debugger.ts
index d4acd0a0c..ce383b4b0 100644
--- a/core/renderers/common/debugger.ts
+++ b/core/renderers/common/debugger.ts
@@ -14,30 +14,22 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {ConnectionType} from '../../connection_type';
 import {FieldLabel} from '../../field_label';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {RenderedConnection} from '../../rendered_connection';
 import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Measurable} from '../measurables/base';
+import type {Measurable} from '../measurables/base';
 import {Field} from '../measurables/field';
-/* eslint-disable-next-line no-unused-vars */
-import {InRowSpacer} from '../measurables/in_row_spacer';
+import type {InRowSpacer} from '../measurables/in_row_spacer';
 import {InputConnection} from '../measurables/input_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
+import type {Row} from '../measurables/row';
 import {Types} from '../measurables/types';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo as ZelosInfo} from '../zelos/info';
+import type {RenderInfo as ZelosInfo} from '../zelos/info';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
+import type {ConstantProvider} from './constants';
+import type {RenderInfo} from './info';
 
 
 /**
diff --git a/core/renderers/common/drawer.ts b/core/renderers/common/drawer.ts
index 1bf20aabd..94deb3608 100644
--- a/core/renderers/common/drawer.ts
+++ b/core/renderers/common/drawer.ts
@@ -14,29 +14,20 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import * as svgPaths from '../../utils/svg_paths';
 import {Connection} from '../measurables/connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ExternalValueInput} from '../measurables/external_value_input';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../measurables/field';
-/* eslint-disable-next-line no-unused-vars */
-import {Icon} from '../measurables/icon';
-/* eslint-disable-next-line no-unused-vars */
-import {InlineInput} from '../measurables/inline_input';
-/* eslint-disable-next-line no-unused-vars */
-import {PreviousConnection} from '../measurables/previous_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
+import type {ExternalValueInput} from '../measurables/external_value_input';
+import type {Field} from '../measurables/field';
+import type {Icon} from '../measurables/icon';
+import type {InlineInput} from '../measurables/inline_input';
+import type {PreviousConnection} from '../measurables/previous_connection';
+import type {Row} from '../measurables/row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider, Notch, PuzzleTab} from './constants';
+import type {ConstantProvider, Notch, PuzzleTab} from './constants';
 import * as debug from './debug';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
+import type {RenderInfo} from './info';
 
 
 /**
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
index 841324e24..f95dff520 100644
--- a/core/renderers/common/i_path_object.ts
+++ b/core/renderers/common/i_path_object.ts
@@ -28,8 +28,7 @@ import '../../theme';
 
 import {BlockStyle} from '../../theme';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
+import type {ConstantProvider} from './constants';
 
 
 /**
diff --git a/core/renderers/common/info.ts b/core/renderers/common/info.ts
index 28aef83df..e651d5785 100644
--- a/core/renderers/common/info.ts
+++ b/core/renderers/common/info.ts
@@ -14,14 +14,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {Align, Input} from '../../input';
 import {inputTypes} from '../../input_types';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Measurable} from '../measurables/base';
+import type {RenderedConnection} from '../../rendered_connection';
+import type {Measurable} from '../measurables/base';
 import {BottomRow} from '../measurables/bottom_row';
 import {ExternalValueInput} from '../measurables/external_value_input';
 import {Field} from '../measurables/field';
@@ -35,18 +32,15 @@ import {NextConnection} from '../measurables/next_connection';
 import {OutputConnection} from '../measurables/output_connection';
 import {PreviousConnection} from '../measurables/previous_connection';
 import {RoundCorner} from '../measurables/round_corner';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
+import type {Row} from '../measurables/row';
 import {SpacerRow} from '../measurables/spacer_row';
 import {SquareCorner} from '../measurables/square_corner';
 import {StatementInput} from '../measurables/statement_input';
 import {TopRow} from '../measurables/top_row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderer';
+import type {ConstantProvider} from './constants';
+import type {Renderer} from './renderer';
 
 
 /**
diff --git a/core/renderers/common/marker_svg.ts b/core/renderers/common/marker_svg.ts
index 0dde99382..3f9bd4145 100644
--- a/core/renderers/common/marker_svg.ts
+++ b/core/renderers/common/marker_svg.ts
@@ -17,29 +17,21 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../events/events_marker_move';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from '../../connection';
+import type {BlockSvg} from '../../block_svg';
+import type {Connection} from '../../connection';
 import {ConnectionType} from '../../connection_type';
 import * as eventUtils from '../../events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../../field';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationSvg} from '../../interfaces/i_ast_node_location_svg';
+import type {Field} from '../../field';
+import type {IASTNodeLocationSvg} from '../../interfaces/i_ast_node_location_svg';
 import {ASTNode} from '../../keyboard_nav/ast_node';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from '../../keyboard_nav/marker';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {Marker} from '../../keyboard_nav/marker';
+import type {RenderedConnection} from '../../rendered_connection';
 import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
 import * as svgPaths from '../../utils/svg_paths';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../../workspace_svg';
+import type {WorkspaceSvg} from '../../workspace_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider, Notch, PuzzleTab} from './constants';
+import type {ConstantProvider, Notch, PuzzleTab} from './constants';
 
 
 /** The name of the CSS class for a cursor. */
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
index 185e6e1e3..f14a6c1b2 100644
--- a/core/renderers/common/path_object.ts
+++ b/core/renderers/common/path_object.ts
@@ -18,18 +18,14 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from '../../connection';
+import type {BlockSvg} from '../../block_svg';
+import type {Connection} from '../../connection';
 import {BlockStyle} from '../../theme';
 import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
-/* eslint-disable-next-line no-unused-vars */
-import {IPathObject} from './i_path_object';
+import type {ConstantProvider} from './constants';
+import type {IPathObject} from './i_path_object';
 
 
 /**
diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts
index 7020d2ada..c10369472 100644
--- a/core/renderers/common/renderer.ts
+++ b/core/renderers/common/renderer.ts
@@ -14,30 +14,22 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../../block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {Block} from '../../block';
+import type {BlockSvg} from '../../block_svg';
 import {Connection} from '../../connection';
 import {ConnectionType} from '../../connection_type';
 import {InsertionMarkerManager, PreviewType} from '../../insertion_marker_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {IRegistrable} from '../../interfaces/i_registrable';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from '../../keyboard_nav/marker';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {IRegistrable} from '../../interfaces/i_registrable';
+import type {Marker} from '../../keyboard_nav/marker';
+import type {RenderedConnection} from '../../rendered_connection';
 import {BlockStyle, Theme} from '../../theme';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../../workspace_svg';
+import type {WorkspaceSvg} from '../../workspace_svg';
 
 import {ConstantProvider} from './constants';
 import * as debug from './debug';
-/* eslint-disable-next-line no-unused-vars */
-import {Debug} from './debugger';
+import type {Debug} from './debugger';
 import {Drawer} from './drawer';
-/* eslint-disable-next-line no-unused-vars */
-import {IPathObject} from './i_path_object';
+import type {IPathObject} from './i_path_object';
 import {RenderInfo} from './info';
 import {MarkerSvg} from './marker_svg';
 import {PathObject} from './path_object';
diff --git a/core/renderers/geras/drawer.ts b/core/renderers/geras/drawer.ts
index 3b0a1efa7..9ed775bf3 100644
--- a/core/renderers/geras/drawer.ts
+++ b/core/renderers/geras/drawer.ts
@@ -14,22 +14,17 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import * as svgPaths from '../../utils/svg_paths';
 import * as debug from '../common/debug';
 import {Drawer as BaseDrawer} from '../common/drawer';
 import {Row} from '../measurables/row';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
+import type {ConstantProvider} from './constants';
 import {Highlighter} from './highlighter';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
-/* eslint-disable-next-line no-unused-vars */
-import {InlineInput} from './measurables/inline_input';
-/* eslint-disable-next-line no-unused-vars */
-import {PathObject} from './path_object';
+import type {RenderInfo} from './info';
+import type {InlineInput} from './measurables/inline_input';
+import type {PathObject} from './path_object';
 
 
 /**
diff --git a/core/renderers/geras/highlight_constants.ts b/core/renderers/geras/highlight_constants.ts
index fb8ff69f8..5138d99f6 100644
--- a/core/renderers/geras/highlight_constants.ts
+++ b/core/renderers/geras/highlight_constants.ts
@@ -15,8 +15,7 @@
 
 
 import * as svgPaths from '../../utils/svg_paths';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 
 /** An object containing sizing and path information about an outside corner. */
diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts
index 6b74c6e0c..549e94520 100644
--- a/core/renderers/geras/highlighter.ts
+++ b/core/renderers/geras/highlighter.ts
@@ -21,22 +21,16 @@
 import './renderer';
 
 import * as svgPaths from '../../utils/svg_paths';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
-/* eslint-disable-next-line no-unused-vars */
-import {BottomRow} from '../measurables/bottom_row';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
+import type {ConstantProvider} from '../common/constants';
+import type {BottomRow} from '../measurables/bottom_row';
+import type {Row} from '../measurables/row';
 import {SpacerRow} from '../measurables/spacer_row';
-/* eslint-disable-next-line no-unused-vars */
-import {TopRow} from '../measurables/top_row';
+import type {TopRow} from '../measurables/top_row';
 import {Types} from '../measurables/types';
 
 import {HighlightConstantProvider, InsideCorner, JaggedTeeth, Notch, OutsideCorner, PuzzleTab, StartHat} from './highlight_constants';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
-/* eslint-disable-next-line no-unused-vars */
-import {InlineInput} from './measurables/inline_input';
+import type {RenderInfo} from './info';
+import type {InlineInput} from './measurables/inline_input';
 
 
 /**
diff --git a/core/renderers/geras/info.ts b/core/renderers/geras/info.ts
index d8832b278..50d2eb2da 100644
--- a/core/renderers/geras/info.ts
+++ b/core/renderers/geras/info.ts
@@ -16,31 +16,24 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {Input} from '../../input';
 import {inputTypes} from '../../input_types';
 import {RenderInfo as BaseRenderInfo} from '../common/info';
 import {Measurable} from '../measurables/base';
-/* eslint-disable-next-line no-unused-vars */
-import {BottomRow} from '../measurables/bottom_row';
+import type {BottomRow} from '../measurables/bottom_row';
 import {ExternalValueInput} from '../measurables/external_value_input';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../measurables/field';
+import type {Field} from '../measurables/field';
 import {InRowSpacer} from '../measurables/in_row_spacer';
-/* eslint-disable-next-line no-unused-vars */
-import {InputRow} from '../measurables/input_row';
+import type {InputRow} from '../measurables/input_row';
 import {Row} from '../measurables/row';
-/* eslint-disable-next-line no-unused-vars */
-import {TopRow} from '../measurables/top_row';
+import type {TopRow} from '../measurables/top_row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
+import type {ConstantProvider} from './constants';
 import {InlineInput} from './measurables/inline_input';
 import {StatementInput} from './measurables/statement_input';
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderer';
+import type {Renderer} from './renderer';
 
 
 /**
diff --git a/core/renderers/geras/measurables/inline_input.ts b/core/renderers/geras/measurables/inline_input.ts
index a2e8e46b3..867f691ce 100644
--- a/core/renderers/geras/measurables/inline_input.ts
+++ b/core/renderers/geras/measurables/inline_input.ts
@@ -17,12 +17,10 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../../input';
+import type {Input} from '../../../input';
 import {ConstantProvider as BaseConstantProvider} from '../../../renderers/common/constants';
 import {InlineInput as BaseInlineInput} from '../../../renderers/measurables/inline_input';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider as GerasConstantProvider} from '../constants';
+import type {ConstantProvider as GerasConstantProvider} from '../constants';
 
 
 /**
diff --git a/core/renderers/geras/measurables/statement_input.ts b/core/renderers/geras/measurables/statement_input.ts
index 77bd9e2a9..5661b666a 100644
--- a/core/renderers/geras/measurables/statement_input.ts
+++ b/core/renderers/geras/measurables/statement_input.ts
@@ -17,12 +17,10 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../../input';
+import type {Input} from '../../../input';
 import {ConstantProvider as BaseConstantProvider} from '../../../renderers/common/constants';
 import {StatementInput as BaseStatementInput} from '../../../renderers/measurables/statement_input';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider as GerasConstantProvider} from '../constants';
+import type {ConstantProvider as GerasConstantProvider} from '../constants';
 
 
 /**
diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts
index 7b21ab090..3dd0ac8ff 100644
--- a/core/renderers/geras/path_object.ts
+++ b/core/renderers/geras/path_object.ts
@@ -25,8 +25,7 @@ import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
 import {PathObject as BasePathObject} from '../common/path_object';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
+import type {ConstantProvider} from './constants';
 
 
 /**
diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts
index f98bfe43c..7b503765c 100644
--- a/core/renderers/geras/renderer.ts
+++ b/core/renderers/geras/renderer.ts
@@ -18,12 +18,10 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../common/constants';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {BlockStyle, Theme} from '../../theme';
 import * as blockRendering from '../common/block_rendering';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo as BaseRenderInfo} from '../common/info';
+import type {RenderInfo as BaseRenderInfo} from '../common/info';
 import {Renderer as BaseRenderer} from '../common/renderer';
 
 import {ConstantProvider} from './constants';
diff --git a/core/renderers/measurables/base.ts b/core/renderers/measurables/base.ts
index 78173d81a..78bd5dbdd 100644
--- a/core/renderers/measurables/base.ts
+++ b/core/renderers/measurables/base.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Types} from './types';
 
diff --git a/core/renderers/measurables/bottom_row.ts b/core/renderers/measurables/bottom_row.ts
index abb1827cc..f417a52ae 100644
--- a/core/renderers/measurables/bottom_row.ts
+++ b/core/renderers/measurables/bottom_row.ts
@@ -16,13 +16,10 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {BlockSvg} from '../../block_svg';
+import type {ConstantProvider} from '../common/constants';
 
-/* eslint-disable-next-line no-unused-vars */
-import {NextConnection} from './next_connection';
+import type {NextConnection} from './next_connection';
 import {Row} from './row';
 import {Types} from './types';
 
diff --git a/core/renderers/measurables/connection.ts b/core/renderers/measurables/connection.ts
index 776f4a565..924b52e40 100644
--- a/core/renderers/measurables/connection.ts
+++ b/core/renderers/measurables/connection.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {RenderedConnection} from '../../rendered_connection';
 import {ConstantProvider, Shape} from '../common/constants';
 
 import {Measurable} from './base';
diff --git a/core/renderers/measurables/external_value_input.ts b/core/renderers/measurables/external_value_input.ts
index dda30b09b..c2651c6a5 100644
--- a/core/renderers/measurables/external_value_input.ts
+++ b/core/renderers/measurables/external_value_input.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../input';
+import type {Input} from '../../input';
 import {ConstantProvider} from '../common/constants';
 
 import {InputConnection} from './input_connection';
diff --git a/core/renderers/measurables/field.ts b/core/renderers/measurables/field.ts
index fb265a4d6..10d0da498 100644
--- a/core/renderers/measurables/field.ts
+++ b/core/renderers/measurables/field.ts
@@ -17,10 +17,8 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Field as BlocklyField} from '../../field';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../input';
+import type {Field as BlocklyField} from '../../field';
+import type {Input} from '../../input';
 import {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
diff --git a/core/renderers/measurables/hat.ts b/core/renderers/measurables/hat.ts
index 5bd924b43..0b4c7da0a 100644
--- a/core/renderers/measurables/hat.ts
+++ b/core/renderers/measurables/hat.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
 import {Types} from './types';
diff --git a/core/renderers/measurables/icon.ts b/core/renderers/measurables/icon.ts
index 45c329550..515cfcfff 100644
--- a/core/renderers/measurables/icon.ts
+++ b/core/renderers/measurables/icon.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Icon as BlocklyIcon} from '../../icon';
+import type {Icon as BlocklyIcon} from '../../icon';
 import {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
diff --git a/core/renderers/measurables/in_row_spacer.ts b/core/renderers/measurables/in_row_spacer.ts
index dabe4c14b..db3b9cf70 100644
--- a/core/renderers/measurables/in_row_spacer.ts
+++ b/core/renderers/measurables/in_row_spacer.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
 import {Types} from './types';
diff --git a/core/renderers/measurables/inline_input.ts b/core/renderers/measurables/inline_input.ts
index 9285718d4..b21a6a01a 100644
--- a/core/renderers/measurables/inline_input.ts
+++ b/core/renderers/measurables/inline_input.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../input';
+import type {Input} from '../../input';
 import {ConstantProvider} from '../common/constants';
 
 import {InputConnection} from './input_connection';
diff --git a/core/renderers/measurables/input_connection.ts b/core/renderers/measurables/input_connection.ts
index 8a2c23e33..566318508 100644
--- a/core/renderers/measurables/input_connection.ts
+++ b/core/renderers/measurables/input_connection.ts
@@ -14,14 +14,10 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../input';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {BlockSvg} from '../../block_svg';
+import type {Input} from '../../input';
+import type {RenderedConnection} from '../../rendered_connection';
+import type {ConstantProvider} from '../common/constants';
 
 import {Connection} from './connection';
 import {Types} from './types';
diff --git a/core/renderers/measurables/input_row.ts b/core/renderers/measurables/input_row.ts
index 8e37e0ab9..d14958a00 100644
--- a/core/renderers/measurables/input_row.ts
+++ b/core/renderers/measurables/input_row.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {ExternalValueInput} from './external_value_input';
 import {InputConnection} from './input_connection';
diff --git a/core/renderers/measurables/jagged_edge.ts b/core/renderers/measurables/jagged_edge.ts
index 1bc9e71f7..54b189b50 100644
--- a/core/renderers/measurables/jagged_edge.ts
+++ b/core/renderers/measurables/jagged_edge.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
 import {Types} from './types';
diff --git a/core/renderers/measurables/next_connection.ts b/core/renderers/measurables/next_connection.ts
index d8f870a29..e23a043bc 100644
--- a/core/renderers/measurables/next_connection.ts
+++ b/core/renderers/measurables/next_connection.ts
@@ -16,10 +16,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {RenderedConnection} from '../../rendered_connection';
+import type {ConstantProvider} from '../common/constants';
 
 import {Connection} from './connection';
 import {Types} from './types';
diff --git a/core/renderers/measurables/output_connection.ts b/core/renderers/measurables/output_connection.ts
index a411798e9..c216208b4 100644
--- a/core/renderers/measurables/output_connection.ts
+++ b/core/renderers/measurables/output_connection.ts
@@ -16,10 +16,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {RenderedConnection} from '../../rendered_connection';
+import type {ConstantProvider} from '../common/constants';
 
 import {Connection} from './connection';
 import {Types} from './types';
diff --git a/core/renderers/measurables/previous_connection.ts b/core/renderers/measurables/previous_connection.ts
index c2c6a1224..c8a1e806e 100644
--- a/core/renderers/measurables/previous_connection.ts
+++ b/core/renderers/measurables/previous_connection.ts
@@ -16,10 +16,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {RenderedConnection} from '../../rendered_connection';
+import type {ConstantProvider} from '../common/constants';
 
 import {Connection} from './connection';
 import {Types} from './types';
diff --git a/core/renderers/measurables/round_corner.ts b/core/renderers/measurables/round_corner.ts
index 6e2978f38..2891e0249 100644
--- a/core/renderers/measurables/round_corner.ts
+++ b/core/renderers/measurables/round_corner.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
 import {Types} from './types';
diff --git a/core/renderers/measurables/row.ts b/core/renderers/measurables/row.ts
index 9f5c9d561..e5a1f5c7d 100644
--- a/core/renderers/measurables/row.ts
+++ b/core/renderers/measurables/row.ts
@@ -14,15 +14,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Measurable} from './base';
-/* eslint-disable-next-line no-unused-vars */
-import {InRowSpacer} from './in_row_spacer';
-/* eslint-disable-next-line no-unused-vars */
-import {InputConnection} from './input_connection';
+import type {Measurable} from './base';
+import type {InRowSpacer} from './in_row_spacer';
+import type {InputConnection} from './input_connection';
 import {Types} from './types';
 
 
diff --git a/core/renderers/measurables/spacer_row.ts b/core/renderers/measurables/spacer_row.ts
index ed7b134c9..f9e39935f 100644
--- a/core/renderers/measurables/spacer_row.ts
+++ b/core/renderers/measurables/spacer_row.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {InRowSpacer} from './in_row_spacer';
 import {Row} from './row';
diff --git a/core/renderers/measurables/square_corner.ts b/core/renderers/measurables/square_corner.ts
index 53ce03364..6ed8167be 100644
--- a/core/renderers/measurables/square_corner.ts
+++ b/core/renderers/measurables/square_corner.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {ConstantProvider} from '../common/constants';
 
 import {Measurable} from './base';
 import {Types} from './types';
diff --git a/core/renderers/measurables/statement_input.ts b/core/renderers/measurables/statement_input.ts
index 08079ac69..99fcc4e80 100644
--- a/core/renderers/measurables/statement_input.ts
+++ b/core/renderers/measurables/statement_input.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../input';
+import type {Input} from '../../input';
 import {ConstantProvider} from '../common/constants';
 
 import {InputConnection} from './input_connection';
diff --git a/core/renderers/measurables/top_row.ts b/core/renderers/measurables/top_row.ts
index 6a4fb45d1..6c69616c1 100644
--- a/core/renderers/measurables/top_row.ts
+++ b/core/renderers/measurables/top_row.ts
@@ -14,14 +14,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../common/constants';
+import type {BlockSvg} from '../../block_svg';
+import type {ConstantProvider} from '../common/constants';
 
 import {Hat} from './hat';
-/* eslint-disable-next-line no-unused-vars */
-import {PreviousConnection} from './previous_connection';
+import type {PreviousConnection} from './previous_connection';
 import {Row} from './row';
 import {Types} from './types';
 
diff --git a/core/renderers/measurables/types.ts b/core/renderers/measurables/types.ts
index 807ccdc31..c934ed767 100644
--- a/core/renderers/measurables/types.ts
+++ b/core/renderers/measurables/types.ts
@@ -14,10 +14,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Measurable} from './base';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from './row';
+import type {Measurable} from './base';
+import type {Row} from './row';
 
 
 /**
diff --git a/core/renderers/minimalist/drawer.ts b/core/renderers/minimalist/drawer.ts
index dc261baae..421a05bf6 100644
--- a/core/renderers/minimalist/drawer.ts
+++ b/core/renderers/minimalist/drawer.ts
@@ -14,12 +14,10 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {Drawer as BaseDrawer} from '../common/drawer';
 
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
+import type {RenderInfo} from './info';
 
 
 /**
diff --git a/core/renderers/minimalist/info.ts b/core/renderers/minimalist/info.ts
index c76312f1e..4305de510 100644
--- a/core/renderers/minimalist/info.ts
+++ b/core/renderers/minimalist/info.ts
@@ -14,12 +14,10 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {RenderInfo as BaseRenderInfo} from '../common/info';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderer';
+import type {Renderer} from './renderer';
 
 
 /**
diff --git a/core/renderers/minimalist/renderer.ts b/core/renderers/minimalist/renderer.ts
index ed8451a2d..75e6d99c7 100644
--- a/core/renderers/minimalist/renderer.ts
+++ b/core/renderers/minimalist/renderer.ts
@@ -14,11 +14,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import * as blockRendering from '../common/block_rendering';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo as BaseRenderInfo} from '../common/info';
+import type {RenderInfo as BaseRenderInfo} from '../common/info';
 import {Renderer as BaseRenderer} from '../common/renderer';
 
 import {ConstantProvider} from './constants';
diff --git a/core/renderers/thrasos/info.ts b/core/renderers/thrasos/info.ts
index 87e77298f..951d93e72 100644
--- a/core/renderers/thrasos/info.ts
+++ b/core/renderers/thrasos/info.ts
@@ -16,22 +16,17 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {RenderInfo as BaseRenderInfo} from '../common/info';
 import {Measurable} from '../measurables/base';
-/* eslint-disable-next-line no-unused-vars */
-import {BottomRow} from '../measurables/bottom_row';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from '../measurables/field';
+import type {BottomRow} from '../measurables/bottom_row';
+import type {Field} from '../measurables/field';
 import {InRowSpacer} from '../measurables/in_row_spacer';
 import {Row} from '../measurables/row';
-/* eslint-disable-next-line no-unused-vars */
-import {TopRow} from '../measurables/top_row';
+import type {TopRow} from '../measurables/top_row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderer';
+import type {Renderer} from './renderer';
 
 
 /**
diff --git a/core/renderers/thrasos/renderer.ts b/core/renderers/thrasos/renderer.ts
index 48b3a50d7..9a268027a 100644
--- a/core/renderers/thrasos/renderer.ts
+++ b/core/renderers/thrasos/renderer.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import * as blockRendering from '../common/block_rendering';
 import {Renderer as BaseRenderer} from '../common/renderer';
 
diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts
index b6d685bb4..ef8452ffc 100644
--- a/core/renderers/zelos/constants.ts
+++ b/core/renderers/zelos/constants.ts
@@ -23,8 +23,7 @@ import * as utilsColour from '../../utils/colour';
 import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
 import * as svgPaths from '../../utils/svg_paths';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider as BaseConstantProvider, Shape} from '../common/constants';
+import type {ConstantProvider as BaseConstantProvider, Shape} from '../common/constants';
 
 
 /** An object containing sizing and path information about inside corners. */
diff --git a/core/renderers/zelos/drawer.ts b/core/renderers/zelos/drawer.ts
index ac281a608..987632dff 100644
--- a/core/renderers/zelos/drawer.ts
+++ b/core/renderers/zelos/drawer.ts
@@ -14,28 +14,20 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import * as svgPaths from '../../utils/svg_paths';
-/* eslint-disable-next-line no-unused-vars */
-import {BaseShape, DynamicShape, Notch} from '../common/constants';
+import type {BaseShape, DynamicShape, Notch} from '../common/constants';
 import * as debug from '../common/debug';
 import {Drawer as BaseDrawer} from '../common/drawer';
 import {InlineInput} from '../measurables/inline_input';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
-/* eslint-disable-next-line no-unused-vars */
-import {SpacerRow} from '../measurables/spacer_row';
+import type {Row} from '../measurables/row';
+import type {SpacerRow} from '../measurables/spacer_row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {InsideCorners} from './constants';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo} from './info';
-/* eslint-disable-next-line no-unused-vars */
-import {StatementInput} from './measurables/inputs';
-/* eslint-disable-next-line no-unused-vars */
-import {PathObject} from './path_object';
+import type {InsideCorners} from './constants';
+import type {RenderInfo} from './info';
+import type {StatementInput} from './measurables/inputs';
+import type {PathObject} from './path_object';
 
 
 /**
diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts
index 42fad5e9d..8ae962af2 100644
--- a/core/renderers/zelos/info.ts
+++ b/core/renderers/zelos/info.ts
@@ -15,36 +15,28 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {FieldImage} from '../../field_image';
 import {FieldLabel} from '../../field_label';
 import {FieldTextInput} from '../../field_textinput';
 import {Align, Input} from '../../input';
 import {inputTypes} from '../../input_types';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo as BaseRenderInfo} from '../common/info';
-/* eslint-disable-next-line no-unused-vars */
-import {Measurable} from '../measurables/base';
+import type {RenderInfo as BaseRenderInfo} from '../common/info';
+import type {Measurable} from '../measurables/base';
 import {Field} from '../measurables/field';
 import {InRowSpacer} from '../measurables/in_row_spacer';
 import {InputConnection} from '../measurables/input_connection';
-/* eslint-disable-next-line no-unused-vars */
-import {Row} from '../measurables/row';
-/* eslint-disable-next-line no-unused-vars */
-import {SpacerRow} from '../measurables/spacer_row';
+import type {Row} from '../measurables/row';
+import type {SpacerRow} from '../measurables/spacer_row';
 import {Types} from '../measurables/types';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider, InsideCorners} from './constants';
+import type {ConstantProvider, InsideCorners} from './constants';
 import {BottomRow} from './measurables/bottom_row';
 import {StatementInput} from './measurables/inputs';
 import {RightConnectionShape} from './measurables/row_elements';
 import {TopRow} from './measurables/top_row';
-/* eslint-disable-next-line no-unused-vars */
-import {PathObject} from './path_object';
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderer';
+import type {PathObject} from './path_object';
+import type {Renderer} from './renderer';
 
 
 /**
diff --git a/core/renderers/zelos/marker_svg.ts b/core/renderers/zelos/marker_svg.ts
index 52a2c43b0..6692deede 100644
--- a/core/renderers/zelos/marker_svg.ts
+++ b/core/renderers/zelos/marker_svg.ts
@@ -14,24 +14,17 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {ASTNode} from '../../keyboard_nav/ast_node';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from '../../keyboard_nav/marker';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderedConnection} from '../../rendered_connection';
+import type {BlockSvg} from '../../block_svg';
+import type {ASTNode} from '../../keyboard_nav/ast_node';
+import type {Marker} from '../../keyboard_nav/marker';
+import type {RenderedConnection} from '../../rendered_connection';
 import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../../workspace_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider as BaseConstantProvider} from '../common/constants';
+import type {WorkspaceSvg} from '../../workspace_svg';
+import type {ConstantProvider as BaseConstantProvider} from '../common/constants';
 import {MarkerSvg as BaseMarkerSvg} from '../common/marker_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider as ZelosConstantProvider} from './constants';
+import type {ConstantProvider as ZelosConstantProvider} from './constants';
 
 
 /**
diff --git a/core/renderers/zelos/measurables/bottom_row.ts b/core/renderers/zelos/measurables/bottom_row.ts
index d5b8135e8..2fb1fcaf9 100644
--- a/core/renderers/zelos/measurables/bottom_row.ts
+++ b/core/renderers/zelos/measurables/bottom_row.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../../block_svg';
+import type {BlockSvg} from '../../../block_svg';
 import {ConstantProvider} from '../../../renderers/common/constants';
 import {BottomRow as BaseBottomRow} from '../../../renderers/measurables/bottom_row';
 
diff --git a/core/renderers/zelos/measurables/inputs.ts b/core/renderers/zelos/measurables/inputs.ts
index abda1523b..8e24745ac 100644
--- a/core/renderers/zelos/measurables/inputs.ts
+++ b/core/renderers/zelos/measurables/inputs.ts
@@ -17,8 +17,7 @@
 
 
 /* eslint-disable-next-line no-unused-vars */
-/* eslint-disable-next-line no-unused-vars */
-import {Input} from '../../../input';
+import type {Input} from '../../../input';
 import {ConstantProvider} from '../../../renderers/common/constants';
 import {StatementInput as BaseStatementInput} from '../../../renderers/measurables/statement_input';
 
diff --git a/core/renderers/zelos/measurables/row_elements.ts b/core/renderers/zelos/measurables/row_elements.ts
index f436567ff..dba4fc2f5 100644
--- a/core/renderers/zelos/measurables/row_elements.ts
+++ b/core/renderers/zelos/measurables/row_elements.ts
@@ -16,8 +16,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from '../../../renderers/common/constants';
+import type {ConstantProvider} from '../../../renderers/common/constants';
 import {Measurable} from '../../../renderers/measurables/base';
 import {Types} from '../../../renderers/measurables/types';
 
diff --git a/core/renderers/zelos/measurables/top_row.ts b/core/renderers/zelos/measurables/top_row.ts
index a578aef03..3ba1b676f 100644
--- a/core/renderers/zelos/measurables/top_row.ts
+++ b/core/renderers/zelos/measurables/top_row.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../../block_svg';
+import type {BlockSvg} from '../../../block_svg';
 import {ConstantProvider} from '../../../renderers/common/constants';
 import {TopRow as BaseTopRow} from '../../../renderers/measurables/top_row';
 
diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts
index ac8a3bec2..9a0508ec4 100644
--- a/core/renderers/zelos/path_object.ts
+++ b/core/renderers/zelos/path_object.ts
@@ -25,8 +25,7 @@ import * as dom from '../../utils/dom';
 import {Svg} from '../../utils/svg';
 import {PathObject as BasePathObject} from '../common/path_object';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConstantProvider} from './constants';
+import type {ConstantProvider} from './constants';
 
 
 /**
diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts
index ec4058e85..c6a7a2c7a 100644
--- a/core/renderers/zelos/renderer.ts
+++ b/core/renderers/zelos/renderer.ts
@@ -18,20 +18,16 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../theme';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../../block_svg';
+import type {BlockSvg} from '../../block_svg';
 import {Connection} from '../../connection';
 import {ConnectionType} from '../../connection_type';
 import {InsertionMarkerManager} from '../../insertion_marker_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from '../../keyboard_nav/marker';
+import type {Marker} from '../../keyboard_nav/marker';
 import {RenderedConnection} from '../../rendered_connection';
 import {BlockStyle} from '../../theme';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../../workspace_svg';
+import type {WorkspaceSvg} from '../../workspace_svg';
 import * as blockRendering from '../common/block_rendering';
-/* eslint-disable-next-line no-unused-vars */
-import {RenderInfo as BaseRenderInfo} from '../common/info';
+import type {RenderInfo as BaseRenderInfo} from '../common/info';
 import {Renderer as BaseRenderer} from '../common/renderer';
 
 import {ConstantProvider} from './constants';
diff --git a/core/scrollbar.ts b/core/scrollbar.ts
index 76faeadc0..e1beade4a 100644
--- a/core/scrollbar.ts
+++ b/core/scrollbar.ts
@@ -18,12 +18,10 @@ import * as browserEvents from './browser_events';
 import * as Touch from './touch';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Metrics} from './utils/metrics';
+import type {Metrics} from './utils/metrics';
 import {Svg} from './utils/svg';
 import * as svgMath from './utils/svg_math';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/scrollbar_pair.ts b/core/scrollbar_pair.ts
index 21ec6e73c..0ccef0ca6 100644
--- a/core/scrollbar_pair.ts
+++ b/core/scrollbar_pair.ts
@@ -17,11 +17,9 @@
 import * as eventUtils from './events/utils';
 import {Scrollbar} from './scrollbar';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Metrics} from './utils/metrics';
+import type {Metrics} from './utils/metrics';
 import {Svg} from './utils/svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/serialization/blocks.ts b/core/serialization/blocks.ts
index fd4441343..160231dce 100644
--- a/core/serialization/blocks.ts
+++ b/core/serialization/blocks.ts
@@ -15,10 +15,8 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from '../block_svg';
+import type {Block} from '../block';
+import type {BlockSvg} from '../block_svg';
 // eslint-disable-next-line no-unused-vars
 import {Connection} from '../connection';
 import * as eventUtils from '../events/utils';
diff --git a/core/serialization/exceptions.ts b/core/serialization/exceptions.ts
index 164035c87..798949a2c 100644
--- a/core/serialization/exceptions.ts
+++ b/core/serialization/exceptions.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from '../block';
+import type {Block} from '../block';
 
 // eslint-disable-next-line no-unused-vars
 import {State} from './blocks';
diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts
index c1ee785ed..4011f4322 100644
--- a/core/shortcut_items.ts
+++ b/core/shortcut_items.ts
@@ -18,8 +18,7 @@ import {BlockSvg} from './block_svg';
 import * as clipboard from './clipboard';
 import * as common from './common';
 import {Gesture} from './gesture';
-/* eslint-disable-next-line no-unused-vars */
-import {ICopyable} from './interfaces/i_copyable';
+import type {ICopyable} from './interfaces/i_copyable';
 import {KeyboardShortcut, ShortcutRegistry} from './shortcut_registry';
 import {KeyCodes} from './utils/keycodes';
 import {WorkspaceSvg} from './workspace_svg';
diff --git a/core/shortcut_registry.ts b/core/shortcut_registry.ts
index 60032ec9a..60871ec11 100644
--- a/core/shortcut_registry.ts
+++ b/core/shortcut_registry.ts
@@ -18,8 +18,7 @@
 
 import {KeyCodes} from './utils/keycodes';
 import * as object from './utils/object';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/theme_manager.ts b/core/theme_manager.ts
index afa83bd97..682d715fb 100644
--- a/core/theme_manager.ts
+++ b/core/theme_manager.ts
@@ -16,14 +16,11 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Theme} from './theme';
+import type {Theme} from './theme';
 import * as arrayUtils from './utils/array';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Workspace} from './workspace';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/toolbox/category.ts b/core/toolbox/category.ts
index fbdc62380..2eba8bce9 100644
--- a/core/toolbox/category.ts
+++ b/core/toolbox/category.ts
@@ -15,12 +15,9 @@
 
 
 import * as Css from '../css';
-/* eslint-disable-next-line no-unused-vars */
-import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {ISelectableToolboxItem} from '../interfaces/i_selectable_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from '../interfaces/i_toolbox';
+import type {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
+import type {ISelectableToolboxItem} from '../interfaces/i_selectable_toolbox_item';
+import type {IToolbox} from '../interfaces/i_toolbox';
 import {IToolboxItem} from '../interfaces/i_toolbox_item';
 import * as registry from '../registry';
 import * as aria from '../utils/aria';
diff --git a/core/toolbox/collapsible_category.ts b/core/toolbox/collapsible_category.ts
index fd0860430..7d9facd61 100644
--- a/core/toolbox/collapsible_category.ts
+++ b/core/toolbox/collapsible_category.ts
@@ -14,12 +14,9 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from '../interfaces/i_toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolboxItem} from '../interfaces/i_toolbox_item';
+import type {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
+import type {IToolbox} from '../interfaces/i_toolbox';
+import type {IToolboxItem} from '../interfaces/i_toolbox_item';
 import * as registry from '../registry';
 import * as aria from '../utils/aria';
 import * as dom from '../utils/dom';
diff --git a/core/toolbox/separator.ts b/core/toolbox/separator.ts
index 5cf0fc048..3c808fc4e 100644
--- a/core/toolbox/separator.ts
+++ b/core/toolbox/separator.ts
@@ -15,12 +15,10 @@
 
 
 import * as Css from '../css';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from '../interfaces/i_toolbox';
+import type {IToolbox} from '../interfaces/i_toolbox';
 import * as registry from '../registry';
 import * as dom from '../utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import * as toolbox from '../utils/toolbox';
+import type * as toolbox from '../utils/toolbox';
 
 import {ToolboxItem} from './toolbox_item';
 
diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts
index 70892dc9a..bc9d9a1c5 100644
--- a/core/toolbox/toolbox.ts
+++ b/core/toolbox/toolbox.ts
@@ -21,32 +21,22 @@ import '../shortcut_registry';
 import '../events/events_toolbox_item_select';
 
 import {BlockSvg} from '../block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from '../blockly_options';
+import type {BlocklyOptions} from '../blockly_options';
 import * as browserEvents from '../browser_events';
 import * as common from '../common';
 import {ComponentManager} from '../component_manager';
 import * as Css from '../css';
 import {DeleteArea} from '../delete_area';
 import * as eventUtils from '../events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IAutoHideable} from '../interfaces/i_autohideable';
-/* eslint-disable-next-line no-unused-vars */
-import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from '../interfaces/i_draggable';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from '../interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {IKeyboardAccessible} from '../interfaces/i_keyboard_accessible';
-/* eslint-disable-next-line no-unused-vars */
-import {ISelectableToolboxItem} from '../interfaces/i_selectable_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {IStyleable} from '../interfaces/i_styleable';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from '../interfaces/i_toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolboxItem} from '../interfaces/i_toolbox_item';
+import type {IAutoHideable} from '../interfaces/i_autohideable';
+import type {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
+import type {IDraggable} from '../interfaces/i_draggable';
+import type {IFlyout} from '../interfaces/i_flyout';
+import type {IKeyboardAccessible} from '../interfaces/i_keyboard_accessible';
+import type {ISelectableToolboxItem} from '../interfaces/i_selectable_toolbox_item';
+import type {IStyleable} from '../interfaces/i_styleable';
+import type {IToolbox} from '../interfaces/i_toolbox';
+import type {IToolboxItem} from '../interfaces/i_toolbox_item';
 import {Options} from '../options';
 import * as registry from '../registry';
 import {KeyboardShortcut} from '../shortcut_registry';
@@ -56,11 +46,9 @@ import * as dom from '../utils/dom';
 import {KeyCodes} from '../utils/keycodes';
 import {Rect} from '../utils/rect';
 import * as toolbox from '../utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type {WorkspaceSvg} from '../workspace_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ToolboxCategory} from './category';
+import type {ToolboxCategory} from './category';
 import {CollapsibleToolboxCategory} from './collapsible_category';
 
 
diff --git a/core/toolbox/toolbox_item.ts b/core/toolbox/toolbox_item.ts
index 2cbaf8614..0f92dd5e0 100644
--- a/core/toolbox/toolbox_item.ts
+++ b/core/toolbox/toolbox_item.ts
@@ -14,17 +14,12 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from '../interfaces/i_toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolboxItem} from '../interfaces/i_toolbox_item';
+import type {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
+import type {IToolbox} from '../interfaces/i_toolbox';
+import type {IToolboxItem} from '../interfaces/i_toolbox_item';
 import * as idGenerator from '../utils/idgenerator';
-/* eslint-disable-next-line no-unused-vars */
-import * as toolbox from '../utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type * as toolbox from '../utils/toolbox';
+import type {WorkspaceSvg} from '../workspace_svg';
 
 
 /**
diff --git a/core/touch.ts b/core/touch.ts
index 4bf1047ad..974c54e88 100644
--- a/core/touch.ts
+++ b/core/touch.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Gesture} from './gesture';
+import type {Gesture} from './gesture';
 
 
 /**
diff --git a/core/touch_gesture.ts b/core/touch_gesture.ts
index 6a5263fc0..886764b12 100644
--- a/core/touch_gesture.ts
+++ b/core/touch_gesture.ts
@@ -20,8 +20,7 @@ import * as browserEvents from './browser_events';
 import {Gesture} from './gesture';
 import * as Touch from './touch';
 import {Coordinate} from './utils/coordinate';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /*
diff --git a/core/trashcan.ts b/core/trashcan.ts
index 91bd68765..e9f1f1965 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -20,38 +20,29 @@ import './metrics_manager';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_trashcan_open';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
+import type {BlocklyOptions} from './blockly_options';
 import * as browserEvents from './browser_events';
 import {ComponentManager} from './component_manager';
 import {DeleteArea} from './delete_area';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockDelete} from './events/events_block_delete';
+import type {Abstract} from './events/events_abstract';
+import type {BlockDelete} from './events/events_block_delete';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IAutoHideable} from './interfaces/i_autohideable';
-/* eslint-disable-next-line no-unused-vars */
-import {IDraggable} from './interfaces/i_draggable';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {IPositionable} from './interfaces/i_positionable';
+import type {IAutoHideable} from './interfaces/i_autohideable';
+import type {IDraggable} from './interfaces/i_draggable';
+import type {IFlyout} from './interfaces/i_flyout';
+import type {IPositionable} from './interfaces/i_positionable';
 import {UiMetrics} from './metrics_manager';
 import {Options} from './options';
 import * as uiPosition from './positionable_helpers';
 import * as registry from './registry';
-/* eslint-disable-next-line no-unused-vars */
-import * as blocks from './serialization/blocks';
+import type * as blocks from './serialization/blocks';
 import {SPRITE} from './sprites';
 import * as dom from './utils/dom';
 import {Rect} from './utils/rect';
 import {Size} from './utils/size';
 import {Svg} from './utils/svg';
 import * as toolbox from './utils/toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/utils.ts b/core/utils.ts
index 028d24f0d..e90fadf50 100644
--- a/core/utils.ts
+++ b/core/utils.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import * as browserEvents from './browser_events';
 import * as common from './common';
 import * as extensions from './extensions';
@@ -41,8 +40,7 @@ import * as svgPaths from './utils/svg_paths';
 import * as toolbox from './utils/toolbox';
 import * as userAgent from './utils/useragent';
 import * as xml from './utils/xml';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 export {
diff --git a/core/utils/dom.ts b/core/utils/dom.ts
index 80b3691cc..d698ca629 100644
--- a/core/utils/dom.ts
+++ b/core/utils/dom.ts
@@ -18,8 +18,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Svg} from './svg';
+import type {Svg} from './svg';
 import * as userAgent from './useragent';
 
 
diff --git a/core/utils/svg_math.ts b/core/utils/svg_math.ts
index 68fcfdcc7..469eac440 100644
--- a/core/utils/svg_math.ts
+++ b/core/utils/svg_math.ts
@@ -14,8 +14,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from '../workspace_svg';
+import type {WorkspaceSvg} from '../workspace_svg';
 
 import {Coordinate} from './coordinate';
 import * as deprecation from './deprecation';
diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts
index 882c09e64..88db54a5a 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -21,8 +21,7 @@ import '../toolbox/category';
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../toolbox/separator';
 
-/* eslint-disable-next-line no-unused-vars */
-import {ConnectionState} from '../serialization/blocks';
+import type {ConnectionState} from '../serialization/blocks';
 import {CssConfig as CategoryCssConfig} from '../toolbox/category';
 import {CssConfig as SeparatorCssConfig} from '../toolbox/separator';
 import * as Xml from '../xml';
diff --git a/core/variable_map.ts b/core/variable_map.ts
index 0f0206f15..7706a639b 100644
--- a/core/variable_map.ts
+++ b/core/variable_map.ts
@@ -19,8 +19,7 @@ import './events/events_var_delete';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_var_rename';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
+import type {Block} from './block';
 import * as dialog from './dialog';
 import * as eventUtils from './events/utils';
 import {Msg} from './msg';
@@ -28,8 +27,7 @@ import {Names} from './names';
 import * as arrayUtils from './utils/array';
 import * as idGenerator from './utils/idgenerator';
 import {VariableModel} from './variable_model';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/variable_model.ts b/core/variable_model.ts
index 663fa39a2..1b9bb5fdb 100644
--- a/core/variable_model.ts
+++ b/core/variable_model.ts
@@ -19,8 +19,7 @@ import './events/events_var_create';
 
 import * as eventUtils from './events/utils';
 import * as idGenerator from './utils/idgenerator';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/variables.ts b/core/variables.ts
index e1bde181b..57fb4fb87 100644
--- a/core/variables.ts
+++ b/core/variables.ts
@@ -19,10 +19,8 @@ import * as dialog from './dialog';
 import {Msg} from './msg';
 import * as utilsXml from './utils/xml';
 import {VariableModel} from './variable_model';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Workspace} from './workspace';
+import type {WorkspaceSvg} from './workspace_svg';
 import * as Xml from './xml';
 
 
diff --git a/core/variables_dynamic.ts b/core/variables_dynamic.ts
index 5c22bdb68..6bfe73bb4 100644
--- a/core/variables_dynamic.ts
+++ b/core/variables_dynamic.ts
@@ -20,10 +20,8 @@ import {Msg} from './msg';
 import * as xml from './utils/xml';
 import {VariableModel} from './variable_model';
 import * as Variables from './variables';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Workspace} from './workspace';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/warning.ts b/core/warning.ts
index 6c63e75c5..a6bc8803a 100644
--- a/core/warning.ts
+++ b/core/warning.ts
@@ -17,13 +17,11 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
+import type {BlockSvg} from './block_svg';
 import {Bubble} from './bubble';
 import * as eventUtils from './events/utils';
 import {Icon} from './icon';
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {Svg} from './utils/svg';
 
diff --git a/core/widgetdiv.ts b/core/widgetdiv.ts
index 7a9310bd9..0f8524136 100644
--- a/core/widgetdiv.ts
+++ b/core/widgetdiv.ts
@@ -20,12 +20,9 @@
 
 import * as common from './common';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Rect} from './utils/rect';
-/* eslint-disable-next-line no-unused-vars */
-import {Size} from './utils/size';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {Rect} from './utils/rect';
+import type {Size} from './utils/size';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /** The object currently using this container. */
diff --git a/core/workspace.ts b/core/workspace.ts
index 938503af4..573bb7d37 100644
--- a/core/workspace.ts
+++ b/core/workspace.ts
@@ -17,31 +17,22 @@
 // Unused import preserved for side-effects. Remove if unneeded.
 import './connection_checker';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
-/* eslint-disable-next-line no-unused-vars */
-import {ConnectionDB} from './connection_db';
-/* eslint-disable-next-line no-unused-vars */
-import {Abstract} from './events/events_abstract';
+import type {Block} from './block';
+import type {BlocklyOptions} from './blockly_options';
+import type {ConnectionDB} from './connection_db';
+import type {Abstract} from './events/events_abstract';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocation} from './interfaces/i_ast_node_location';
-/* eslint-disable-next-line no-unused-vars */
-import {IConnectionChecker} from './interfaces/i_connection_checker';
+import type {IASTNodeLocation} from './interfaces/i_ast_node_location';
+import type {IConnectionChecker} from './interfaces/i_connection_checker';
 import {Options} from './options';
 import * as registry from './registry';
 import * as arrayUtils from './utils/array';
 import * as idGenerator from './utils/idgenerator';
 import * as math from './utils/math';
-/* eslint-disable-next-line no-unused-vars */
-import * as toolbox from './utils/toolbox';
+import type * as toolbox from './utils/toolbox';
 import {VariableMap} from './variable_map';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from './variable_model';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from './workspace_comment';
+import type {VariableModel} from './variable_model';
+import type {WorkspaceComment} from './workspace_comment';
 
 
 /** Database of all workspaces. */
diff --git a/core/workspace_audio.ts b/core/workspace_audio.ts
index f20c28ca5..ff2fc93fb 100644
--- a/core/workspace_audio.ts
+++ b/core/workspace_audio.ts
@@ -17,8 +17,7 @@
 
 
 import * as userAgent from './utils/useragent';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts
index 0ad757e63..1011c540a 100644
--- a/core/workspace_comment.ts
+++ b/core/workspace_comment.ts
@@ -21,14 +21,12 @@ import './events/events_comment_create';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_comment_delete';
 
-/* eslint-disable-next-line no-unused-vars */
-import {CommentMove} from './events/events_comment_move';
+import type {CommentMove} from './events/events_comment_move';
 import * as eventUtils from './events/utils';
 import {Coordinate} from './utils/coordinate';
 import * as idGenerator from './utils/idgenerator';
 import * as xml from './utils/xml';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 
 
 /**
diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts
index 1d8357e17..0824b7afc 100644
--- a/core/workspace_comment_svg.ts
+++ b/core/workspace_comment_svg.ts
@@ -21,19 +21,15 @@ import './events/events_comment_delete';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_selected';
 
-/* eslint-disable-next-line no-unused-vars */
-import {BlockDragSurfaceSvg} from './block_drag_surface';
+import type {BlockDragSurfaceSvg} from './block_drag_surface';
 import * as browserEvents from './browser_events';
 import * as common from './common';
 import * as ContextMenu from './contextmenu';
 import * as Css from './css';
-/* eslint-disable-next-line no-unused-vars */
-import {CommentMove} from './events/events_comment_move';
+import type {CommentMove} from './events/events_comment_move';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IBoundedElement} from './interfaces/i_bounded_element';
-/* eslint-disable-next-line no-unused-vars */
-import {IBubble} from './interfaces/i_bubble';
+import type {IBoundedElement} from './interfaces/i_bounded_element';
+import type {IBubble} from './interfaces/i_bubble';
 import {CopyData, ICopyable} from './interfaces/i_copyable';
 import * as Touch from './touch';
 import {Coordinate} from './utils/coordinate';
@@ -42,8 +38,7 @@ import {Rect} from './utils/rect';
 import {Svg} from './utils/svg';
 import * as svgMath from './utils/svg_math';
 import {WorkspaceComment} from './workspace_comment';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /** Size of the resize icon. */
diff --git a/core/workspace_drag_surface_svg.ts b/core/workspace_drag_surface_svg.ts
index 959dd16e9..888fd06cd 100644
--- a/core/workspace_drag_surface_svg.ts
+++ b/core/workspace_drag_surface_svg.ts
@@ -20,8 +20,7 @@
  */
 
 
-/* eslint-disable-next-line no-unused-vars */
-import {Coordinate} from './utils/coordinate';
+import type {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
 import {Svg} from './utils/svg';
 import * as svgMath from './utils/svg_math';
diff --git a/core/workspace_dragger.ts b/core/workspace_dragger.ts
index bc9095e44..babff42b5 100644
--- a/core/workspace_dragger.ts
+++ b/core/workspace_dragger.ts
@@ -16,8 +16,7 @@
 
 import * as common from './common';
 import {Coordinate} from './utils/coordinate';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 94dbdc6d0..d1f3d270e 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -40,13 +40,10 @@ import './metrics_manager';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './msg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockDragSurfaceSvg} from './block_drag_surface';
+import type {Block} from './block';
+import type {BlockDragSurfaceSvg} from './block_drag_surface';
 import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {BlocklyOptions} from './blockly_options';
+import type {BlocklyOptions} from './blockly_options';
 import * as browserEvents from './browser_events';
 import * as common from './common';
 import {ComponentManager} from './component_manager';
@@ -56,71 +53,52 @@ import * as ContextMenu from './contextmenu';
 import {ContextMenuRegistry} from './contextmenu_registry';
 import * as dropDownDiv from './dropdowndiv';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {FlyoutButton} from './flyout_button';
+import type {FlyoutButton} from './flyout_button';
 import {Gesture} from './gesture';
 import {Grid} from './grid';
-/* eslint-disable-next-line no-unused-vars */
-import {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {IBoundedElement} from './interfaces/i_bounded_element';
-/* eslint-disable-next-line no-unused-vars */
-import {ICopyable} from './interfaces/i_copyable';
-/* eslint-disable-next-line no-unused-vars */
-import {IDragTarget} from './interfaces/i_drag_target';
-/* eslint-disable-next-line no-unused-vars */
-import {IFlyout} from './interfaces/i_flyout';
-/* eslint-disable-next-line no-unused-vars */
-import {IMetricsManager} from './interfaces/i_metrics_manager';
-/* eslint-disable-next-line no-unused-vars */
-import {IToolbox} from './interfaces/i_toolbox';
-/* eslint-disable-next-line no-unused-vars */
-import {Cursor} from './keyboard_nav/cursor';
-/* eslint-disable-next-line no-unused-vars */
-import {Marker} from './keyboard_nav/marker';
+import type {IASTNodeLocationSvg} from './interfaces/i_ast_node_location_svg';
+import type {IBoundedElement} from './interfaces/i_bounded_element';
+import type {ICopyable} from './interfaces/i_copyable';
+import type {IDragTarget} from './interfaces/i_drag_target';
+import type {IFlyout} from './interfaces/i_flyout';
+import type {IMetricsManager} from './interfaces/i_metrics_manager';
+import type {IToolbox} from './interfaces/i_toolbox';
+import type {Cursor} from './keyboard_nav/cursor';
+import type {Marker} from './keyboard_nav/marker';
 import {MarkerManager} from './marker_manager';
 import {Options} from './options';
 import * as Procedures from './procedures';
 import * as registry from './registry';
 import * as blockRendering from './renderers/common/block_rendering';
-/* eslint-disable-next-line no-unused-vars */
-import {Renderer} from './renderers/common/renderer';
-/* eslint-disable-next-line no-unused-vars */
-import {ScrollbarPair} from './scrollbar_pair';
+import type {Renderer} from './renderers/common/renderer';
+import type {ScrollbarPair} from './scrollbar_pair';
 import * as blocks from './serialization/blocks';
-/* eslint-disable-next-line no-unused-vars */
-import {Theme} from './theme';
+import type {Theme} from './theme';
 import {Classic} from './theme/classic';
 import {ThemeManager} from './theme_manager';
 import * as Tooltip from './tooltip';
 import {TouchGesture} from './touch_gesture';
-/* eslint-disable-next-line no-unused-vars */
-import {Trashcan} from './trashcan';
+import type {Trashcan} from './trashcan';
 import * as utils from './utils';
 import * as arrayUtils from './utils/array';
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
-/* eslint-disable-next-line no-unused-vars */
-import {Metrics} from './utils/metrics';
+import type {Metrics} from './utils/metrics';
 import {Rect} from './utils/rect';
 import {Size} from './utils/size';
 import {Svg} from './utils/svg';
 import * as svgMath from './utils/svg_math';
 import * as toolbox from './utils/toolbox';
 import * as userAgent from './utils/useragent';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from './variable_model';
+import type {VariableModel} from './variable_model';
 import * as Variables from './variables';
 import * as VariablesDynamic from './variables_dynamic';
 import * as WidgetDiv from './widgetdiv';
 import {Workspace} from './workspace';
 import {WorkspaceAudio} from './workspace_audio';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceComment} from './workspace_comment';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceCommentSvg} from './workspace_comment_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceDragSurfaceSvg} from './workspace_drag_surface_svg';
+import type {WorkspaceComment} from './workspace_comment';
+import type {WorkspaceCommentSvg} from './workspace_comment_svg';
+import type {WorkspaceDragSurfaceSvg} from './workspace_drag_surface_svg';
 import * as Xml from './xml';
 import {ZoomControls} from './zoom_controls';
 
diff --git a/core/xml.ts b/core/xml.ts
index 703abba20..3de0e4de3 100644
--- a/core/xml.ts
+++ b/core/xml.ts
@@ -23,28 +23,21 @@ import './workspace_comment';
 // Unused import preserved for side-effects. Remove if unneeded.
 import './workspace_comment_svg';
 
-/* eslint-disable-next-line no-unused-vars */
-import {Block} from './block';
-/* eslint-disable-next-line no-unused-vars */
-import {BlockSvg} from './block_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {Connection} from './connection';
+import type {Block} from './block';
+import type {BlockSvg} from './block_svg';
+import type {Connection} from './connection';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {Field} from './field';
+import type {Field} from './field';
 import {inputTypes} from './input_types';
 import * as dom from './utils/dom';
 import {Size} from './utils/size';
 import * as utilsXml from './utils/xml';
-/* eslint-disable-next-line no-unused-vars */
-import {VariableModel} from './variable_model';
+import type {VariableModel} from './variable_model';
 import * as Variables from './variables';
-/* eslint-disable-next-line no-unused-vars */
-import {Workspace} from './workspace';
+import type {Workspace} from './workspace';
 import {WorkspaceComment} from './workspace_comment';
 import {WorkspaceCommentSvg} from './workspace_comment_svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**
diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts
index 3b3947c5e..0b2ea53be 100644
--- a/core/zoom_controls.ts
+++ b/core/zoom_controls.ts
@@ -24,8 +24,7 @@ import * as browserEvents from './browser_events';
 import {ComponentManager} from './component_manager';
 import * as Css from './css';
 import * as eventUtils from './events/utils';
-/* eslint-disable-next-line no-unused-vars */
-import {IPositionable} from './interfaces/i_positionable';
+import type {IPositionable} from './interfaces/i_positionable';
 import {UiMetrics} from './metrics_manager';
 import * as uiPosition from './positionable_helpers';
 import {SPRITE} from './sprites';
@@ -34,8 +33,7 @@ import * as dom from './utils/dom';
 import {Rect} from './utils/rect';
 import {Size} from './utils/size';
 import {Svg} from './utils/svg';
-/* eslint-disable-next-line no-unused-vars */
-import {WorkspaceSvg} from './workspace_svg';
+import type {WorkspaceSvg} from './workspace_svg';
 
 
 /**