diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index ac03dd7652..f9ff870658 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -14,6 +14,7 @@ goog.require('ol.TileState');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');
+goog.require('ol.tilegrid');
 
 
 
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 41e1b56c31..ca4d7ed9ad 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -14,6 +14,7 @@ goog.require('ol.geom.GeometryType');
 goog.require('ol.layer.Vector');
 goog.require('ol.renderer.canvas.Layer');
 goog.require('ol.renderer.canvas.VectorRenderer');
+goog.require('ol.tilegrid');
 goog.require('ol.tilegrid.TileGrid');
 
 
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index a3d99ff47d..1c3c38ea7b 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -16,6 +16,7 @@ goog.require('ol.ViewHint');
 goog.require('ol.dom');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.dom.Layer');
+goog.require('ol.tilegrid');
 goog.require('ol.tilegrid.TileGrid');
 
 
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index ff586257fc..53616f2c4e 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -23,6 +23,7 @@ goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.webgl.FragmentShader');
 goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.renderer.webgl.VertexShader');
+goog.require('ol.tilegrid');
 
 
 
diff --git a/test/spec/ol/source/wms.test.js b/test/spec/ol/source/wms.test.js
index c2d3774965..a437be4e17 100644
--- a/test/spec/ol/source/wms.test.js
+++ b/test/spec/ol/source/wms.test.js
@@ -35,6 +35,7 @@ describe('ol.source.wms', function() {
 
 
 goog.require('ol.TileCoord');
+goog.require('ol.TileUrlFunction');
 goog.require('ol.projection');
 goog.require('ol.source.wms');
 goog.require('ol.tilegrid');
diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js
index 507b170a8d..9cf0b7add6 100644
--- a/test/spec/ol/tilegrid/tilegrid.test.js
+++ b/test/spec/ol/tilegrid/tilegrid.test.js
@@ -660,4 +660,5 @@ goog.require('ol.Extent');
 goog.require('ol.Size');
 goog.require('ol.TileCoord');
 goog.require('ol.projection');
+goog.require('ol.tilegrid');
 goog.require('ol.tilegrid.TileGrid');
diff --git a/test/spec/ol/tileurlfunction.test.js b/test/spec/ol/tileurlfunction.test.js
index 89380718e8..9e6b58f67a 100644
--- a/test/spec/ol/tileurlfunction.test.js
+++ b/test/spec/ol/tileurlfunction.test.js
@@ -97,7 +97,8 @@ describe('ol.TileUrlFunction', function() {
 
 });
 
+goog.require('ol.Size');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.projection');
-goog.require('ol.tilegrid.XYZ');
+goog.require('ol.tilegrid');