diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 2e85eac5a..414249aaa 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -20,6 +20,7 @@ goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.svgPaths');
 
 goog.requireType('Blockly.geras.PathObject');
+goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index 811c0e16b..20a16ecf0 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -23,6 +23,12 @@ goog.require('Blockly.blockRendering.TopRow');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.utils.svgPaths');
 
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.geras.ConstantProvider');
+goog.requireType('Blockly.geras.HighlightConstantProvider');
+goog.requireType('Blockly.geras.Renderer');
+goog.requireType('Blockly.geras.RenderInfo');
+
 
 /**
  * An object that adds highlights to a block based on the given rendering
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 90f7d66cb..5c22e76e0 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -16,6 +16,7 @@ goog.provide('Blockly.geras.RenderInfo');
 
 goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.blockRendering.InputRow');
+goog.require('Blockly.blockRendering.InRowSpacer');
 goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.NextConnection');
 goog.require('Blockly.blockRendering.OutputConnection');
@@ -34,6 +35,10 @@ goog.require('Blockly.geras.InlineInput');
 goog.require('Blockly.geras.StatementInput');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.geras.Renderer');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.blockRendering.Field');
+
 
 /**
  * An object containing all sizing information needed to draw this block.
diff --git a/core/renderers/geras/measurables/inputs.js b/core/renderers/geras/measurables/inputs.js
index 14c601768..53996dbe6 100644
--- a/core/renderers/geras/measurables/inputs.js
+++ b/core/renderers/geras/measurables/inputs.js
@@ -15,6 +15,11 @@ goog.provide('Blockly.geras.InlineInput');
 goog.provide('Blockly.geras.StatementInput');
 
 goog.require('Blockly.utils.object');
+goog.require('Blockly.blockRendering.InlineInput');
+goog.require('Blockly.blockRendering.StatementInput');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
 
 
 /**
diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js
index fd39c9ffd..474cad3c0 100644
--- a/core/renderers/geras/path_object.js
+++ b/core/renderers/geras/path_object.js
@@ -16,6 +16,7 @@ goog.provide('Blockly.geras.PathObject');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.geras.ConstantProvider');
 goog.require('Blockly.Theme');
+goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Svg');
diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index 34a62a73a..48eab0277 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -21,6 +21,12 @@ goog.require('Blockly.geras.PathObject');
 goog.require('Blockly.geras.RenderInfo');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.blockRendering.RenderInfo');
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Theme');
+
+
 
 /**
  * The geras renderer.