diff --git a/core/browser_events.js b/core/browser_events.js
index 6cc9dda80..9134cc57e 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.browserEvents');
+goog.module('Blockly.browserEvents');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils.global');
@@ -18,11 +19,12 @@ goog.require('Blockly.utils.global');
 
 /**
  * Blockly opaque event data used to unbind events when using
- * `Blockly.browserEvents.bind` and
- * `Blockly.browserEvents.conditionalBind`.
+ * `bind` and
+ * `conditionalBind`.
  * @typedef {!Array<!Array>}
  */
-Blockly.browserEvents.Data;
+let Data;
+exports.Data = Data;
 
 /**
  * Bind an event handler that can be ignored if it is not part of the active
@@ -40,14 +42,14 @@ Blockly.browserEvents.Data;
  *     should prevent the default handler.  False by default.  If
  *     opt_noPreventDefault is provided, opt_noCaptureIdentifier must also be
  *     provided.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.conditionalBind = function(
+const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
-  const handled = false;
+  let handled = false;
   const wrapFunc = function (e) {
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
@@ -100,6 +102,7 @@ Blockly.browserEvents.conditionalBind = function(
   }
   return bindData;
 };
+exports.conditionalBind = conditionalBind;
 
 
 /**
@@ -111,11 +114,11 @@ Blockly.browserEvents.conditionalBind = function(
  * @param {string} name Event name to listen to (e.g. 'mousedown').
  * @param {?Object} thisObject The value of 'this' in the function.
  * @param {!Function} func Function to call when event is triggered.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.bind = function(node, name, thisObject, func) {
+const bind = function(node, name, thisObject, func) {
   const wrapFunc = function (e) {
     if (thisObject) {
       func.call(thisObject, e);
@@ -160,15 +163,16 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
   }
   return bindData;
 };
+exports.bind = bind;
 
 /**
  * Unbind one or more events event from a function call.
- * @param {!Blockly.browserEvents.Data} bindData Opaque data from bindEvent_.
+ * @param {!Data} bindData Opaque data from bindEvent_.
  *     This list is emptied during the course of calling this function.
  * @return {!Function} The function call.
  * @public
  */
-Blockly.browserEvents.unbind = function(bindData) {
+const unbind = function(bindData) {
   let func;
   while (bindData.length) {
     const bindDatum = bindData.pop();
@@ -179,3 +183,4 @@ Blockly.browserEvents.unbind = function(bindData) {
   }
   return func;
 };
+exports.unbind = unbind;
diff --git a/tests/deps.js b/tests/deps.js
index bd2e81f5b..abf82c44d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -14,7 +14,7 @@ goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Bl
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});