diff --git a/core/drag_target.js b/core/drag_target.js
index 91d46c5ca..18e29b40a 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -15,16 +15,18 @@
 goog.module('Blockly.DragTarget');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IDragTarget');
-
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const IDragTarget = goog.require('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const Rect = goog.requireType('Blockly.utils.Rect');
 
 
 /**
  * Abstract class for a component with custom behaviour when a block or bubble
  * is dragged over or dropped on top of it.
- * @implements {Blockly.IDragTarget}
+ * @implements {IDragTarget}
  * @constructor
  */
 const DragTarget = function() {};
@@ -32,14 +34,14 @@ const DragTarget = function() {};
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to the Blockly injection div.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 DragTarget.prototype.getClientRect;
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragEnter = function(_dragElement) {
@@ -49,7 +51,7 @@ DragTarget.prototype.onDragEnter = function(_dragElement) {
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
  * target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragOver = function(_dragElement) {
@@ -58,7 +60,7 @@ DragTarget.prototype.onDragOver = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragExit = function(_dragElement) {
@@ -68,7 +70,7 @@ DragTarget.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDrop = function(_dragElement) {
@@ -79,7 +81,7 @@ DragTarget.prototype.onDrop = function(_dragElement) {
  * Returns whether the provided block or bubble should not be moved after being
  * dropped on this component. If true, the element will return to where it was
  * when the drag started.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @return {boolean} Whether the block or bubble provided should be returned to
  *     drag start.