diff --git a/core/input.js b/core/input.js
index 9a165226e..6f7b63b7a 100644
--- a/core/input.js
+++ b/core/input.js
@@ -16,6 +16,12 @@ goog.require('Blockly.Connection');
 goog.require('Blockly.constants');
 goog.require('Blockly.fieldRegistry');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Field');
+goog.requireType('Blockly.FieldDropdown');
+goog.requireType('Blockly.RenderedConnection');
+
 
 /**
  * Class for an input with an optional field.
diff --git a/core/xml.js b/core/xml.js
index 7a887a29e..21f5770e2 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -24,7 +24,16 @@ goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.global');
+goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.xml');
+goog.require('Blockly.Variables');
+
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.Comment');
+goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.Field');
+goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.VariableModel');
 
 
 /**