diff --git a/blocks/colour.js b/blocks/colour.js
index b13c1ca5b..1f987c089 100644
--- a/blocks/colour.js
+++ b/blocks/colour.js
@@ -32,8 +32,10 @@
 goog.provide('Blockly.Blocks.colour');  // Deprecated
 goog.provide('Blockly.Constants.Colour');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldColour');
+goog.require('Blockly.FieldLabel');
 
 
 /**
diff --git a/blocks/lists.js b/blocks/lists.js
index e5d38804e..ced1e3203 100644
--- a/blocks/lists.js
+++ b/blocks/lists.js
@@ -32,8 +32,11 @@
 goog.provide('Blockly.Blocks.lists');  // Deprecated
 goog.provide('Blockly.Constants.Lists');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldDropdown');
+goog.require('Blockly.FieldLabel');
+
 
 /**
  * Unused constant for the common HSV hue for all blocks in this category.
diff --git a/blocks/logic.js b/blocks/logic.js
index 484cdca71..e36adb627 100644
--- a/blocks/logic.js
+++ b/blocks/logic.js
@@ -32,8 +32,11 @@
 goog.provide('Blockly.Blocks.logic');  // Deprecated
 goog.provide('Blockly.Constants.Logic');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldDropdown');
+goog.require('Blockly.FieldLabel');
+
 
 /**
  * Unused constant for the common HSV hue for all blocks in this category.
diff --git a/blocks/loops.js b/blocks/loops.js
index 92c324780..931e6e7e5 100644
--- a/blocks/loops.js
+++ b/blocks/loops.js
@@ -32,8 +32,12 @@
 goog.provide('Blockly.Blocks.loops');  // Deprecated
 goog.provide('Blockly.Constants.Loops');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldDropdown');
+goog.require('Blockly.FieldLabel');
+goog.require('Blockly.FieldNumber');
+goog.require('Blockly.FieldVariable');
 
 
 /**
diff --git a/blocks/math.js b/blocks/math.js
index 5f6237253..01b0c223a 100644
--- a/blocks/math.js
+++ b/blocks/math.js
@@ -32,8 +32,12 @@
 goog.provide('Blockly.Blocks.math');  // Deprecated
 goog.provide('Blockly.Constants.Math');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldDropdown');
+goog.require('Blockly.FieldLabel');
+goog.require('Blockly.FieldNumber');
+goog.require('Blockly.FieldVariable');
 
 
 /**
diff --git a/blocks/procedures.js b/blocks/procedures.js
index 7e3b811a9..bc4933a99 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -26,8 +26,11 @@
 
 goog.provide('Blockly.Blocks.procedures');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldCheckbox');
+goog.require('Blockly.FieldLabel');
+goog.require('Blockly.FieldTextInput');
 
 
 Blockly.Blocks['procedures_defnoreturn'] = {
diff --git a/blocks/text.js b/blocks/text.js
index c6128cd44..1dbc42f9f 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -27,8 +27,13 @@
 goog.provide('Blockly.Blocks.texts');  // Deprecated
 goog.provide('Blockly.Constants.Text');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldDropdown');
+goog.require('Blockly.FieldImage');
+goog.require('Blockly.FieldMultilineInput');
+goog.require('Blockly.FieldTextInput');
+goog.require('Blockly.FieldVariable');
 
 
 /**
diff --git a/blocks/variables.js b/blocks/variables.js
index 0bb45214b..64e683f2b 100644
--- a/blocks/variables.js
+++ b/blocks/variables.js
@@ -32,8 +32,10 @@
 goog.provide('Blockly.Blocks.variables');  // Deprecated.
 goog.provide('Blockly.Constants.Variables');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldLabel');
+goog.require('Blockly.FieldVariable');
 
 
 /**
diff --git a/blocks/variables_dynamic.js b/blocks/variables_dynamic.js
index 07db1f9e3..110b46909 100644
--- a/blocks/variables_dynamic.js
+++ b/blocks/variables_dynamic.js
@@ -31,8 +31,10 @@
 
 goog.provide('Blockly.Constants.VariablesDynamic');
 
-goog.require('Blockly.Blocks');
 goog.require('Blockly');
+goog.require('Blockly.Blocks');
+goog.require('Blockly.FieldLabel');
+goog.require('Blockly.FieldVariable');
 
 
 /**
diff --git a/build.py b/build.py
index e90709a5f..cc02629c5 100755
--- a/build.py
+++ b/build.py
@@ -245,8 +245,20 @@ class Gen_compressed(threading.Thread):
       ]
 
     # Read in all the source files.
-    # Add Blockly.Blocks to be compatible with the compiler.
-    params.append(("js_code", "goog.provide('Blockly');goog.provide('Blockly.Blocks');"))
+    # Add Blockly, Blockly.Blocks, and all fields to be compatible with the compiler.
+    params.append(("js_code", """
+goog.provide('Blockly');
+goog.provide('Blockly.Blocks');
+goog.provide('Blockly.FieldCheckbox');
+goog.provide('Blockly.FieldColour');
+goog.provide('Blockly.FieldDropdown');
+goog.provide('Blockly.FieldImage');
+goog.provide('Blockly.FieldLabel');
+goog.provide('Blockly.FieldMultilineInput');
+goog.provide('Blockly.FieldNumber');
+goog.provide('Blockly.FieldTextInput');
+goog.provide('Blockly.FieldVariable');
+"""))
     filenames = glob.glob(os.path.join("blocks", "*.js"))
     filenames.sort()  # Deterministic build.
     for filename in filenames:
@@ -254,8 +266,8 @@ class Gen_compressed(threading.Thread):
       params.append(("js_code", "".join(f.readlines()).encode("utf-8")))
       f.close()
 
-    # Remove Blockly.Blocks to be compatible with Blockly.
-    remove = "var Blockly={Blocks:{}};"
+    # Remove Blockly, Blockly.Blocks and all fields to be compatible with Blockly.
+    remove = "var Blockly={Blocks:{},FieldCheckbox:{},FieldColour:{},FieldDropdown:{},FieldImage:{},FieldLabel:{},FieldMultilineInput:{},FieldNumber:{},FieldTextInput:{},FieldVariable:{}};"
     self.do_compile(params, target_filename, filenames, remove)
 
   def gen_generator(self, language):