diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 52fb78a0a..9832d0659 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.ExternalValueInput');
+goog.module('Blockly.blockRendering.ExternalValueInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.ExternalValueInput = function(constants, input) {
-  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
+const ExternalValueInput = function(constants, input) {
+  ExternalValueInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
@@ -49,5 +50,7 @@ Blockly.blockRendering.ExternalValueInput = function(constants, input) {
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
+Blockly.utils.object.inherits(ExternalValueInput,
     Blockly.blockRendering.InputConnection);
+
+exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 59a4bf670..3b3974d79 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InlineInput');
+goog.module('Blockly.blockRendering.InlineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.InlineInput = function(constants, input) {
-  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
+const InlineInput = function(constants, input) {
+  InlineInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
 
@@ -59,5 +60,7 @@ Blockly.blockRendering.InlineInput = function(constants, input) {
   this.connectionOffsetX = this.isDynamicShape ?
       this.shape.connectionOffsetX(this.connectionWidth) : 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
+Blockly.utils.object.inherits(InlineInput,
     Blockly.blockRendering.InputConnection);
+
+exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 420c508ca..67ed3c361 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -9,7 +9,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InputConnection');
+goog.module('Blockly.blockRendering.InputConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.InputConnection = function(constants, input) {
-  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
+const InputConnection = function(constants, input) {
+  InputConnection.superClass_.constructor.call(this,
       constants, input.connection);
 
   this.type |= Blockly.blockRendering.Types.INPUT;
@@ -51,5 +52,7 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
+Blockly.utils.object.inherits(InputConnection,
     Blockly.blockRendering.Connection);
+
+exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 6bd1c23fa..9c3252216 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.StatementInput');
+goog.module('Blockly.blockRendering.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.StatementInput = function(constants, input) {
-  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
 
@@ -46,5 +47,7 @@ Blockly.blockRendering.StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.InputConnection);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 590b1a3d5..f5ad9dd09 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -148,12 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});