diff --git a/src/ol/animation.js b/src/ol/animation.js
index 2aea302e79..980d28ee72 100644
--- a/src/ol/animation.js
+++ b/src/ol/animation.js
@@ -1,6 +1,5 @@
 goog.provide('ol.animation');
 
-goog.require('ol');
 goog.require('ol.ViewHint');
 goog.require('ol.coordinate');
 goog.require('ol.easing');
diff --git a/src/ol/array.js b/src/ol/array.js
index 669d5e6f6f..2524366f0f 100644
--- a/src/ol/array.js
+++ b/src/ol/array.js
@@ -1,7 +1,5 @@
 goog.provide('ol.array');
 
-goog.require('ol');
-
 
 /**
  * Performs a binary search on the provided sorted list and returns the index of the item if found. If it can't be found it'll return -1.
diff --git a/src/ol/control.js b/src/ol/control.js
index c2512af30e..8865b891f9 100644
--- a/src/ol/control.js
+++ b/src/ol/control.js
@@ -1,6 +1,5 @@
 goog.provide('ol.control');
 
-goog.require('ol');
 goog.require('ol.Collection');
 goog.require('ol.control.Attribution');
 goog.require('ol.control.Rotate');
diff --git a/src/ol/extent.js b/src/ol/extent.js
index c24328c37e..adfd9cae87 100644
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -1,6 +1,5 @@
 goog.provide('ol.extent');
 
-goog.require('ol');
 goog.require('ol.asserts');
 goog.require('ol.extent.Corner');
 goog.require('ol.extent.Relationship');
diff --git a/src/ol/format/filter.js b/src/ol/format/filter.js
index cbb16c40da..08bf1d6af1 100644
--- a/src/ol/format/filter.js
+++ b/src/ol/format/filter.js
@@ -1,6 +1,5 @@
 goog.provide('ol.format.filter');
 
-goog.require('ol');
 goog.require('ol.format.filter.And');
 goog.require('ol.format.filter.Bbox');
 goog.require('ol.format.filter.EqualTo');
diff --git a/src/ol/format/filter/filter.js b/src/ol/format/filter/filter.js
index f3c456fc82..48c9f0f3b8 100644
--- a/src/ol/format/filter/filter.js
+++ b/src/ol/format/filter/filter.js
@@ -1,7 +1,5 @@
 goog.provide('ol.format.filter.Filter');
 
-goog.require('ol');
-
 
 /**
  * @classdesc
diff --git a/src/ol/format/xsd.js b/src/ol/format/xsd.js
index af41c84aa5..a3abdb64f7 100644
--- a/src/ol/format/xsd.js
+++ b/src/ol/format/xsd.js
@@ -1,6 +1,5 @@
 goog.provide('ol.format.XSD');
 
-goog.require('ol');
 goog.require('ol.xml');
 goog.require('ol.string');
 
diff --git a/src/ol/geom/flat/closest.js b/src/ol/geom/flat/closest.js
index 1337ff1faf..712b3f260e 100644
--- a/src/ol/geom/flat/closest.js
+++ b/src/ol/geom/flat/closest.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.closest');
 
-goog.require('ol');
 goog.require('ol.math');
 
 
diff --git a/src/ol/geom/flat/contains.js b/src/ol/geom/flat/contains.js
index 1b619216b2..a0248b82d5 100644
--- a/src/ol/geom/flat/contains.js
+++ b/src/ol/geom/flat/contains.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.contains');
 
-goog.require('ol');
 goog.require('ol.extent');
 
 
diff --git a/src/ol/geom/flat/deflate.js b/src/ol/geom/flat/deflate.js
index 5fafe50990..aa0388d119 100644
--- a/src/ol/geom/flat/deflate.js
+++ b/src/ol/geom/flat/deflate.js
@@ -1,7 +1,5 @@
 goog.provide('ol.geom.flat.deflate');
 
-goog.require('ol');
-
 
 /**
  * @param {Array.<number>} flatCoordinates Flat coordinates.
diff --git a/src/ol/geom/flat/geodesic.js b/src/ol/geom/flat/geodesic.js
index e29117e3e8..29b625bbf1 100644
--- a/src/ol/geom/flat/geodesic.js
+++ b/src/ol/geom/flat/geodesic.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.geodesic');
 
-goog.require('ol');
 goog.require('ol.math');
 goog.require('ol.proj');
 
diff --git a/src/ol/geom/flat/interiorpoint.js b/src/ol/geom/flat/interiorpoint.js
index 7b16644b6e..3311a6cf5a 100644
--- a/src/ol/geom/flat/interiorpoint.js
+++ b/src/ol/geom/flat/interiorpoint.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.interiorpoint');
 
-goog.require('ol');
 goog.require('ol.array');
 goog.require('ol.geom.flat.contains');
 
diff --git a/src/ol/geom/flat/interpolate.js b/src/ol/geom/flat/interpolate.js
index 483e80b6ac..b1c0c951ee 100644
--- a/src/ol/geom/flat/interpolate.js
+++ b/src/ol/geom/flat/interpolate.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.interpolate');
 
-goog.require('ol');
 goog.require('ol.array');
 goog.require('ol.math');
 
diff --git a/src/ol/geom/flat/intersectsextent.js b/src/ol/geom/flat/intersectsextent.js
index 629bfdd768..10d64fc623 100644
--- a/src/ol/geom/flat/intersectsextent.js
+++ b/src/ol/geom/flat/intersectsextent.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.intersectsextent');
 
-goog.require('ol');
 goog.require('ol.extent');
 goog.require('ol.geom.flat.contains');
 goog.require('ol.geom.flat.segments');
diff --git a/src/ol/geom/flat/orient.js b/src/ol/geom/flat/orient.js
index f8fc0d481b..3f410034d9 100644
--- a/src/ol/geom/flat/orient.js
+++ b/src/ol/geom/flat/orient.js
@@ -1,6 +1,5 @@
 goog.provide('ol.geom.flat.orient');
 
-goog.require('ol');
 goog.require('ol.geom.flat.reverse');
 
 
diff --git a/src/ol/graticule.js b/src/ol/graticule.js
index 8cb392f0fa..e38f1ca8e3 100644
--- a/src/ol/graticule.js
+++ b/src/ol/graticule.js
@@ -1,6 +1,5 @@
 goog.provide('ol.Graticule');
 
-goog.require('ol');
 goog.require('ol.extent');
 goog.require('ol.geom.GeometryLayout');
 goog.require('ol.geom.LineString');
diff --git a/src/ol/interaction.js b/src/ol/interaction.js
index 65d8aae9fd..e6899598ef 100644
--- a/src/ol/interaction.js
+++ b/src/ol/interaction.js
@@ -1,6 +1,5 @@
 goog.provide('ol.interaction');
 
-goog.require('ol');
 goog.require('ol.Collection');
 goog.require('ol.Kinetic');
 goog.require('ol.interaction.DoubleClickZoom');
diff --git a/src/ol/math.js b/src/ol/math.js
index 37112f902a..c844544cc0 100644
--- a/src/ol/math.js
+++ b/src/ol/math.js
@@ -1,6 +1,5 @@
 goog.provide('ol.math');
 
-goog.require('ol');
 goog.require('ol.asserts');
 
 
diff --git a/src/ol/proj/transforms.js b/src/ol/proj/transforms.js
index 4dc287307f..d3f3e4e4f2 100644
--- a/src/ol/proj/transforms.js
+++ b/src/ol/proj/transforms.js
@@ -1,6 +1,5 @@
 goog.provide('ol.proj.transforms');
 
-goog.require('ol');
 goog.require('ol.obj');
 
 
diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js
index 21d15b4638..68a89ef6f0 100644
--- a/src/ol/render/canvas/replay.js
+++ b/src/ol/render/canvas/replay.js
@@ -8,7 +8,6 @@ goog.require('ol.geom.flat.transform');
 goog.require('ol.has');
 goog.require('ol.obj');
 goog.require('ol.render.VectorContext');
-goog.require('ol.render.canvas');
 goog.require('ol.render.canvas.Instruction');
 goog.require('ol.transform');
 
diff --git a/src/ol/render/webgl.js b/src/ol/render/webgl.js
index f273ac5b43..10b485cd6d 100644
--- a/src/ol/render/webgl.js
+++ b/src/ol/render/webgl.js
@@ -1,5 +1,8 @@
 goog.provide('ol.render.webgl');
 
+goog.require('ol');
+
+
 if (ol.ENABLE_WEBGL) {
 
   /**
diff --git a/src/ol/render/webgl/imagereplay.js b/src/ol/render/webgl/imagereplay.js
index c8b449575c..1a3eb7b92d 100644
--- a/src/ol/render/webgl/imagereplay.js
+++ b/src/ol/render/webgl/imagereplay.js
@@ -5,7 +5,6 @@ goog.require('ol.extent');
 goog.require('ol.obj');
 goog.require('ol.render.webgl.imagereplay.defaultshader');
 goog.require('ol.render.webgl.Replay');
-goog.require('ol.render.webgl');
 goog.require('ol.webgl');
 goog.require('ol.webgl.Buffer');
 goog.require('ol.webgl.Context');
diff --git a/src/ol/render/webgl/immediate.js b/src/ol/render/webgl/immediate.js
index 750cb966c6..5515cd5e9f 100644
--- a/src/ol/render/webgl/immediate.js
+++ b/src/ol/render/webgl/immediate.js
@@ -6,7 +6,6 @@ goog.require('ol.geom.GeometryType');
 goog.require('ol.render.ReplayType');
 goog.require('ol.render.VectorContext');
 goog.require('ol.render.webgl.ReplayGroup');
-goog.require('ol.render.webgl');
 
 
 if (ol.ENABLE_WEBGL) {
diff --git a/src/ol/render/webgl/replaygroup.js b/src/ol/render/webgl/replaygroup.js
index 8312118ee8..28b18c8fd8 100644
--- a/src/ol/render/webgl/replaygroup.js
+++ b/src/ol/render/webgl/replaygroup.js
@@ -6,7 +6,6 @@ goog.require('ol.extent');
 goog.require('ol.obj');
 goog.require('ol.render.replay');
 goog.require('ol.render.ReplayGroup');
-goog.require('ol.render.webgl');
 goog.require('ol.render.webgl.CircleReplay');
 goog.require('ol.render.webgl.ImageReplay');
 goog.require('ol.render.webgl.LineStringReplay');
diff --git a/src/ol/reproj.js b/src/ol/reproj.js
index 2a07419dd1..10da24c84d 100644
--- a/src/ol/reproj.js
+++ b/src/ol/reproj.js
@@ -1,6 +1,5 @@
 goog.provide('ol.reproj');
 
-goog.require('ol');
 goog.require('ol.dom');
 goog.require('ol.extent');
 goog.require('ol.math');
diff --git a/src/ol/structs/lrucache.js b/src/ol/structs/lrucache.js
index 99c2f87525..c0032e5d27 100644
--- a/src/ol/structs/lrucache.js
+++ b/src/ol/structs/lrucache.js
@@ -1,6 +1,5 @@
 goog.provide('ol.structs.LRUCache');
 
-goog.require('ol');
 goog.require('ol.asserts');
 
 
diff --git a/src/ol/structs/priorityqueue.js b/src/ol/structs/priorityqueue.js
index 65930fa226..07b3225e6b 100644
--- a/src/ol/structs/priorityqueue.js
+++ b/src/ol/structs/priorityqueue.js
@@ -1,6 +1,5 @@
 goog.provide('ol.structs.PriorityQueue');
 
-goog.require('ol');
 goog.require('ol.asserts');
 goog.require('ol.obj');
 
diff --git a/src/ol/style/atlas.js b/src/ol/style/atlas.js
index 7a394eabee..b1a6e844c3 100644
--- a/src/ol/style/atlas.js
+++ b/src/ol/style/atlas.js
@@ -1,6 +1,5 @@
 goog.provide('ol.style.Atlas');
 
-goog.require('ol');
 goog.require('ol.dom');
 
 
diff --git a/src/ol/style/iconimagecache.js b/src/ol/style/iconimagecache.js
index a0ba610601..58b1baac69 100644
--- a/src/ol/style/iconimagecache.js
+++ b/src/ol/style/iconimagecache.js
@@ -1,6 +1,5 @@
 goog.provide('ol.style.IconImageCache');
 
-goog.require('ol');
 goog.require('ol.color');
 
 
@@ -87,8 +86,7 @@ ol.style.IconImageCache.prototype.get = function(src, crossOrigin, color) {
  * @param {ol.Color} color Color.
  * @param {ol.style.IconImage} iconImage Icon image.
  */
-ol.style.IconImageCache.prototype.set = function(src, crossOrigin, color,
-                                                 iconImage) {
+ol.style.IconImageCache.prototype.set = function(src, crossOrigin, color, iconImage) {
   var key = ol.style.IconImageCache.getKey(src, crossOrigin, color);
   this.cache_[key] = iconImage;
   ++this.cacheSize_;
diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js
index a1914ad1f2..96f891f4bc 100644
--- a/src/ol/tileurlfunction.js
+++ b/src/ol/tileurlfunction.js
@@ -1,6 +1,5 @@
 goog.provide('ol.TileUrlFunction');
 
-goog.require('ol');
 goog.require('ol.asserts');
 goog.require('ol.math');
 goog.require('ol.tilecoord');
diff --git a/src/ol/webgl.js b/src/ol/webgl.js
index 56a4953497..a8d09b33a9 100644
--- a/src/ol/webgl.js
+++ b/src/ol/webgl.js
@@ -1,5 +1,7 @@
 goog.provide('ol.webgl');
 
+goog.require('ol');
+
 
 if (ol.ENABLE_WEBGL) {
 
diff --git a/src/ol/webgl/shader.js b/src/ol/webgl/shader.js
index 7daf7ae4f8..4a4f507a06 100644
--- a/src/ol/webgl/shader.js
+++ b/src/ol/webgl/shader.js
@@ -1,7 +1,7 @@
 goog.provide('ol.webgl.Shader');
 
+goog.require('ol');
 goog.require('ol.functions');
-goog.require('ol.webgl');
 
 
 if (ol.ENABLE_WEBGL) {
diff --git a/src/ol/xml.js b/src/ol/xml.js
index 5f6eb10c45..29ee8d672e 100644
--- a/src/ol/xml.js
+++ b/src/ol/xml.js
@@ -1,6 +1,5 @@
 goog.provide('ol.xml');
 
-goog.require('ol');
 goog.require('ol.array');