diff --git a/src/ol/array.js b/src/ol/array.js
index 548e7d04c3..8f0e38d062 100644
--- a/src/ol/array.js
+++ b/src/ol/array.js
@@ -1,6 +1,7 @@
 goog.provide('ol.array');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 
 
 /**
diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js
index 04f92ff385..bd427120db 100644
--- a/src/ol/control/attributioncontrol.js
+++ b/src/ol/control/attributioncontrol.js
@@ -3,6 +3,7 @@
 goog.provide('ol.control.Attribution');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.object');
diff --git a/src/ol/control/control.js b/src/ol/control/control.js
index c225082dee..f1afb9ae02 100644
--- a/src/ol/control/control.js
+++ b/src/ol/control/control.js
@@ -2,8 +2,9 @@ goog.provide('ol.control.Control');
 goog.provide('ol.control.ControlOptions');
 
 goog.require('goog.Disposable');
+goog.require('goog.array');
+goog.require('goog.dom');
 goog.require('goog.events');
-goog.require('ol.MapEvent');
 goog.require('ol.MapEventType');
 
 
diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js
index 57f705e16a..56bc13e841 100644
--- a/src/ol/control/mousepositioncontrol.js
+++ b/src/ol/control/mousepositioncontrol.js
@@ -5,6 +5,7 @@ goog.provide('ol.control.MousePosition');
 
 goog.require('goog.array');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.style');
diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js
index 606867ed04..b5f6617fcd 100644
--- a/src/ol/control/scalelinecontrol.js
+++ b/src/ol/control/scalelinecontrol.js
@@ -1,7 +1,11 @@
 goog.provide('ol.control.ScaleLine');
 goog.provide('ol.control.ScaleLineUnits');
 
+goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.math');
 goog.require('goog.style');
 goog.require('ol.FrameState');
 goog.require('ol.ProjectionUnits');
diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js
index a991b902c8..cb709b263a 100644
--- a/src/ol/control/zoomslidercontrol.js
+++ b/src/ol/control/zoomslidercontrol.js
@@ -4,11 +4,16 @@
 
 goog.provide('ol.control.ZoomSlider');
 
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.fx.Dragger');
+goog.require('goog.fx.Dragger.EventType');
+goog.require('goog.math');
+goog.require('goog.math.Rect');
 goog.require('goog.style');
 goog.require('ol.control.Control');
 goog.require('ol.css');
diff --git a/src/ol/dom/dom.js b/src/ol/dom/dom.js
index 7fc85d93aa..24f9d1cddd 100644
--- a/src/ol/dom/dom.js
+++ b/src/ol/dom/dom.js
@@ -4,6 +4,7 @@
 goog.provide('ol.dom');
 goog.provide('ol.dom.BrowserFeature');
 
+goog.require('goog.asserts');
 goog.require('goog.vec.Mat4');
 
 
diff --git a/src/ol/dom/input.js b/src/ol/dom/input.js
index 150c7f75ec..ceeb393ca7 100644
--- a/src/ol/dom/input.js
+++ b/src/ol/dom/input.js
@@ -1,6 +1,8 @@
 goog.provide('ol.dom.Input');
 goog.provide('ol.dom.InputProperty');
 
+goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('ol.Object');
 
 
diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js
index 640eb82f68..bb3e3ef6ae 100644
--- a/src/ol/geolocation.js
+++ b/src/ol/geolocation.js
@@ -4,6 +4,7 @@
 goog.provide('ol.Geolocation');
 goog.provide('ol.GeolocationProperty');
 
+goog.require('goog.events');
 goog.require('goog.functions');
 goog.require('goog.math');
 goog.require('ol.Coordinate');
diff --git a/src/ol/geom/geometrycollection.js b/src/ol/geom/geometrycollection.js
index 8585d95394..71e96e7cfb 100644
--- a/src/ol/geom/geometrycollection.js
+++ b/src/ol/geom/geometrycollection.js
@@ -1,5 +1,6 @@
 goog.provide('ol.geom.GeometryCollection');
 
+goog.require('goog.asserts');
 goog.require('ol.geom.AbstractCollection');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
diff --git a/src/ol/image.js b/src/ol/image.js
index 41d5e6fc88..e1fac80c30 100644
--- a/src/ol/image.js
+++ b/src/ol/image.js
@@ -2,9 +2,11 @@ goog.provide('ol.Image');
 goog.provide('ol.ImageState');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.events');
 goog.require('goog.events.EventTarget');
 goog.require('goog.events.EventType');
+goog.require('goog.object');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
 
diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js
index 22b2ae6df2..3795df9de7 100644
--- a/src/ol/imagetile.js
+++ b/src/ol/imagetile.js
@@ -1,8 +1,10 @@
 goog.provide('ol.ImageTile');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
+goog.require('goog.object');
 goog.require('ol.Tile');
 goog.require('ol.TileCoord');
 goog.require('ol.TileState');
diff --git a/src/ol/interaction/dblclickzoominteraction.js b/src/ol/interaction/dblclickzoominteraction.js
index e758e67d44..5a4946fa77 100644
--- a/src/ol/interaction/dblclickzoominteraction.js
+++ b/src/ol/interaction/dblclickzoominteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.DblClickZoom');
 
+goog.require('goog.asserts');
 goog.require('ol.MapBrowserEvent');
 goog.require('ol.MapBrowserEvent.EventType');
 goog.require('ol.View2D');
diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js
index ce39c4f9d3..9ffd72b8eb 100644
--- a/src/ol/interaction/draginteraction.js
+++ b/src/ol/interaction/draginteraction.js
@@ -1,6 +1,7 @@
 goog.provide('ol.interaction.Drag');
 
 goog.require('goog.asserts');
+goog.require('goog.events.BrowserEvent');
 goog.require('goog.functions');
 goog.require('ol.Coordinate');
 goog.require('ol.MapBrowserEvent');
diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js
index cd8425b37a..4f2ffbab8c 100644
--- a/src/ol/interaction/dragrotateandzoominteraction.js
+++ b/src/ol/interaction/dragrotateandzoominteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.DragRotateAndZoom');
 
+goog.require('goog.asserts');
 goog.require('goog.math.Vec2');
 goog.require('ol.View2D');
 goog.require('ol.interaction.ConditionType');
diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js
index 2ad45dfa78..cfc243d826 100644
--- a/src/ol/interaction/dragrotateinteraction.js
+++ b/src/ol/interaction/dragrotateinteraction.js
@@ -1,5 +1,6 @@
 goog.provide('ol.interaction.DragRotate');
 
+goog.require('goog.asserts');
 goog.require('ol.View2D');
 goog.require('ol.ViewHint');
 goog.require('ol.interaction.ConditionType');
diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js
index 74541b4bab..c6ef59473f 100644
--- a/src/ol/interaction/dragzoominteraction.js
+++ b/src/ol/interaction/dragzoominteraction.js
@@ -3,6 +3,7 @@
 
 goog.provide('ol.interaction.DragZoom');
 
+goog.require('goog.asserts');
 goog.require('ol.Extent');
 goog.require('ol.Size');
 goog.require('ol.View2D');
diff --git a/src/ol/interaction/keyboardinteraction.js b/src/ol/interaction/keyboardinteraction.js
index 8057b858ff..d1ecf926e6 100644
--- a/src/ol/interaction/keyboardinteraction.js
+++ b/src/ol/interaction/keyboardinteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.Keyboard');
 
+goog.require('goog.events.KeyHandler.EventType');
 goog.require('ol.interaction.Interaction');
 
 
diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js
index bf67ce64df..87c15347bb 100644
--- a/src/ol/interaction/keyboardpaninteraction.js
+++ b/src/ol/interaction/keyboardpaninteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.KeyboardPan');
 
+goog.require('goog.asserts');
 goog.require('goog.events.KeyCodes');
 goog.require('goog.events.KeyHandler.EventType');
 goog.require('ol.View2D');
diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js
index 5cdaa334e1..a132841d97 100644
--- a/src/ol/interaction/keyboardzoominteraction.js
+++ b/src/ol/interaction/keyboardzoominteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.KeyboardZoom');
 
+goog.require('goog.asserts');
 goog.require('goog.events.KeyHandler.EventType');
 goog.require('ol.View2D');
 goog.require('ol.interaction.Interaction');
diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js
index 125dba9713..2ed15f70c3 100644
--- a/src/ol/interaction/mousewheelzoominteraction.js
+++ b/src/ol/interaction/mousewheelzoominteraction.js
@@ -2,6 +2,7 @@
 
 goog.provide('ol.interaction.MouseWheelZoom');
 
+goog.require('goog.asserts');
 goog.require('goog.events.MouseWheelEvent');
 goog.require('goog.events.MouseWheelHandler.EventType');
 goog.require('goog.math');
diff --git a/src/ol/interaction/touchinteraction.js b/src/ol/interaction/touchinteraction.js
index 1e96fe7ecb..ec038d0241 100644
--- a/src/ol/interaction/touchinteraction.js
+++ b/src/ol/interaction/touchinteraction.js
@@ -2,6 +2,7 @@
 goog.provide('ol.interaction.Touch');
 
 goog.require('goog.functions');
+goog.require('goog.object');
 goog.require('ol.MapBrowserEvent');
 goog.require('ol.MapBrowserEvent.EventType');
 goog.require('ol.Pixel');
diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js
index 3f4abc3ce7..ac43b51f5a 100644
--- a/src/ol/interaction/touchrotateinteraction.js
+++ b/src/ol/interaction/touchrotateinteraction.js
@@ -3,6 +3,7 @@
 goog.provide('ol.interaction.TouchRotate');
 
 goog.require('goog.asserts');
+goog.require('goog.style');
 goog.require('ol.View');
 goog.require('ol.ViewHint');
 goog.require('ol.interaction.Touch');
diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js
index 06d4665aa7..17409fe8ec 100644
--- a/src/ol/interaction/touchzoominteraction.js
+++ b/src/ol/interaction/touchzoominteraction.js
@@ -3,6 +3,7 @@
 goog.provide('ol.interaction.TouchZoom');
 
 goog.require('goog.asserts');
+goog.require('goog.style');
 goog.require('ol.View');
 goog.require('ol.ViewHint');
 goog.require('ol.interaction.Touch');
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js
index 626b6e0413..9b2a42d9cb 100644
--- a/src/ol/layer/vectorlayer.js
+++ b/src/ol/layer/vectorlayer.js
@@ -1,6 +1,8 @@
 goog.provide('ol.layer.Vector');
 
+goog.require('goog.asserts');
 goog.require('goog.events.EventType');
+goog.require('goog.object');
 goog.require('ol.Feature');
 goog.require('ol.geom.SharedVertices');
 goog.require('ol.layer.Layer');
diff --git a/src/ol/map.js b/src/ol/map.js
index b2f1a29b9f..86fa67972e 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -8,10 +8,14 @@ goog.provide('ol.RendererHint');
 goog.provide('ol.RendererHints');
 
 goog.require('goog.Uri.QueryData');
+goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.async.AnimationDelay');
 goog.require('goog.async.Delay');
 goog.require('goog.debug.Logger');
+goog.require('goog.dispose');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('goog.dom.ViewportSizeMonitor');
 goog.require('goog.events');
 goog.require('goog.events.BrowserEvent');
@@ -21,7 +25,9 @@ goog.require('goog.events.KeyHandler');
 goog.require('goog.events.KeyHandler.EventType');
 goog.require('goog.events.MouseWheelHandler');
 goog.require('goog.events.MouseWheelHandler.EventType');
+goog.require('goog.object');
 goog.require('goog.style');
+goog.require('goog.vec.Mat4');
 goog.require('ol.BrowserFeature');
 goog.require('ol.Collection');
 goog.require('ol.Color');
diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js
index b9a45f6dd4..3afa2f6d71 100644
--- a/src/ol/mapbrowserevent.js
+++ b/src/ol/mapbrowserevent.js
@@ -3,6 +3,7 @@ goog.provide('ol.MapBrowserEvent.EventType');
 goog.provide('ol.MapBrowserEventHandler');
 
 goog.require('goog.array');
+goog.require('goog.events');
 goog.require('goog.events.BrowserEvent');
 goog.require('goog.events.EventTarget');
 goog.require('goog.events.EventType');
diff --git a/src/ol/math.js b/src/ol/math.js
index 8a1d41a965..14ffd2977a 100644
--- a/src/ol/math.js
+++ b/src/ol/math.js
@@ -1,5 +1,7 @@
 goog.provide('ol.math');
 
+goog.require('goog.asserts');
+
 
 /**
  * @param {number} x X.
diff --git a/src/ol/ol.js b/src/ol/ol.js
index 14a0e3d7b2..40532661c9 100644
--- a/src/ol/ol.js
+++ b/src/ol/ol.js
@@ -1,6 +1,7 @@
 goog.provide('ol');
 
 goog.require('goog.debug.Logger');
+goog.require('goog.debug.Logger.Level');
 
 
 if (goog.DEBUG) {
diff --git a/src/ol/overlay.js b/src/ol/overlay.js
index 6e96286bb1..f9ddda6870 100644
--- a/src/ol/overlay.js
+++ b/src/ol/overlay.js
@@ -2,7 +2,9 @@ goog.provide('ol.Overlay');
 goog.provide('ol.OverlayPositioning');
 goog.provide('ol.OverlayProperty');
 
+goog.require('goog.asserts');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.style');
 goog.require('ol.Coordinate');
diff --git a/src/ol/parser/geojson.js b/src/ol/parser/geojson.js
index ce5d0e27c4..83f711205e 100644
--- a/src/ol/parser/geojson.js
+++ b/src/ol/parser/geojson.js
@@ -1,5 +1,6 @@
 goog.provide('ol.parser.GeoJSON');
 
+goog.require('goog.asserts');
 goog.require('ol.Feature');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_0_0.js b/src/ol/parser/ogc/wmscapabilities_v1_0_0.js
index 4e78ea7c5e..fea4adfc95 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_0_0.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_0_0.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_0_0');
+
+goog.require('goog.object');
 goog.require('goog.string');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1_0');
 
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1.js b/src/ol/parser/ogc/wmscapabilities_v1_1.js
index ab8bfd3a8f..b367cfa339 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_1.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_1.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_1');
+
+goog.require('goog.object');
 goog.require('ol.parser.ogc.WMSCapabilities_v1');
 
 
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_0.js b/src/ol/parser/ogc/wmscapabilities_v1_1_0.js
index e00a3da270..ff79ce99f7 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_1_0.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_1_0.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_1_0');
+
+goog.require('goog.object');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1');
 
 
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1.js b/src/ol/parser/ogc/wmscapabilities_v1_1_1.js
index 87e7ab50de..65402d09da 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_1_1.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_1_1.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_1_1');
+
+goog.require('goog.object');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1');
 
 
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js b/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js
index dac01bc925..54defba4c5 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_1_1_WMSC');
+
+goog.require('goog.object');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1_1');
 
 
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_3_0.js b/src/ol/parser/ogc/wmscapabilities_v1_3_0.js
index e1144bf9b0..b795728153 100644
--- a/src/ol/parser/ogc/wmscapabilities_v1_3_0.js
+++ b/src/ol/parser/ogc/wmscapabilities_v1_3_0.js
@@ -1,4 +1,6 @@
 goog.provide('ol.parser.ogc.WMSCapabilities_v1_3_0');
+
+goog.require('goog.object');
 goog.require('ol.parser.ogc.WMSCapabilities_v1');
 
 
diff --git a/src/ol/projection/epsg3857.js b/src/ol/projection/epsg3857.js
index 669b893483..9409522183 100644
--- a/src/ol/projection/epsg3857.js
+++ b/src/ol/projection/epsg3857.js
@@ -1,6 +1,7 @@
 goog.provide('ol.projection.EPSG3857');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('ol.Extent');
 goog.require('ol.Projection');
 goog.require('ol.ProjectionUnits');
diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
index deff997d11..853b6a03bd 100644
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -1,5 +1,7 @@
 goog.provide('ol.renderer.canvas.ImageLayer');
 
+goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 7cfff48d00..88478df7b2 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -3,7 +3,9 @@
 goog.provide('ol.renderer.canvas.Map');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Size');
diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index e700cba2ee..f848b553fc 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -4,7 +4,10 @@
 goog.provide('ol.renderer.canvas.TileLayer');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.object');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Extent');
 goog.require('ol.Size');
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 6a161ca4a3..923b8a4f15 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -1,5 +1,10 @@
 goog.provide('ol.renderer.canvas.VectorLayer');
 
+goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.events');
+goog.require('goog.events.EventType');
+goog.require('goog.object');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Extent');
 goog.require('ol.Size');
diff --git a/src/ol/renderer/canvas/canvasvectorrenderer.js b/src/ol/renderer/canvas/canvasvectorrenderer.js
index 29d87fb035..3019eeedea 100644
--- a/src/ol/renderer/canvas/canvasvectorrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorrenderer.js
@@ -2,6 +2,10 @@ goog.provide('ol.renderer.canvas.VectorRenderer');
 
 
 goog.require('goog.asserts');
+goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Feature');
 goog.require('ol.Pixel');
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js
index bc07ae2776..f74e213dfe 100644
--- a/src/ol/renderer/dom/domimagelayerrenderer.js
+++ b/src/ol/renderer/dom/domimagelayerrenderer.js
@@ -1,6 +1,9 @@
 goog.provide('ol.renderer.dom.ImageLayer');
 
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js
index 7b59b1e7be..cf3ab548c1 100644
--- a/src/ol/renderer/dom/domlayerrenderer.js
+++ b/src/ol/renderer/dom/domlayerrenderer.js
@@ -1,5 +1,6 @@
 goog.provide('ol.renderer.dom.Layer');
 
+goog.require('goog.dom');
 goog.require('ol.layer.Layer');
 goog.require('ol.renderer.Layer');
 
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index e2cff9f1f2..0557898f0d 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -3,8 +3,11 @@
 
 goog.provide('ol.renderer.dom.TileLayer');
 
+goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+goog.require('goog.object');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Coordinate');
diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js
index 59af23f509..f073b3e980 100644
--- a/src/ol/renderer/maprenderer.js
+++ b/src/ol/renderer/maprenderer.js
@@ -3,8 +3,11 @@ goog.provide('ol.renderer.Map');
 goog.require('goog.Disposable');
 goog.require('goog.array');
 goog.require('goog.asserts');
+goog.require('goog.dispose');
 goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.functions');
+goog.require('goog.object');
 goog.require('goog.vec.Mat4');
 goog.require('ol.CollectionEvent');
 goog.require('ol.CollectionEventType');
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js
index e4658636ca..c6b1e2f885 100644
--- a/src/ol/renderer/webgl/webglimagelayerrenderer.js
+++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js
@@ -1,6 +1,10 @@
 goog.provide('ol.renderer.webgl.ImageLayer');
 
+goog.require('goog.asserts');
+goog.require('goog.events');
+goog.require('goog.events.EventType');
 goog.require('goog.vec.Mat4');
+goog.require('goog.webgl');
 goog.require('ol.Coordinate');
 goog.require('ol.Extent');
 goog.require('ol.Image');
diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js
index f2cabe24b0..0ba2fa0b02 100644
--- a/src/ol/renderer/webgl/webgllayerrenderer.js
+++ b/src/ol/renderer/webgl/webgllayerrenderer.js
@@ -3,6 +3,7 @@
 goog.provide('ol.renderer.webgl.Layer');
 
 goog.require('goog.vec.Mat4');
+goog.require('goog.webgl');
 goog.require('ol.FrameState');
 goog.require('ol.layer.Layer');
 goog.require('ol.renderer.Layer');
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index e742c4a1e1..eccff5740d 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -3,11 +3,13 @@
 goog.provide('ol.renderer.webgl.Map');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.debug.Logger');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.Event');
+goog.require('goog.object');
 goog.require('goog.style');
 goog.require('goog.webgl');
 goog.require('ol.FrameState');
diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js
index a141f9fd4f..e514d00c53 100644
--- a/src/ol/source/bingmapssource.js
+++ b/src/ol/source/bingmapssource.js
@@ -2,6 +2,8 @@ goog.provide('ol.source.BingMaps');
 
 goog.require('goog.Uri');
 goog.require('goog.array');
+goog.require('goog.asserts');
+goog.require('goog.math');
 goog.require('goog.net.Jsonp');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js
index a2f22cbc18..f11bbb6be2 100644
--- a/src/ol/source/debugtilesource.js
+++ b/src/ol/source/debugtilesource.js
@@ -1,5 +1,7 @@
 goog.provide('ol.source.DebugTileSource');
 
+goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.TileCache');
diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js
index ca0657344f..9c9d3cbf77 100644
--- a/src/ol/source/imagesource.js
+++ b/src/ol/source/imagesource.js
@@ -1,6 +1,7 @@
 goog.provide('ol.source.ImageSource');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
 goog.require('ol.Image');
diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js
index ed8a65b688..7472314d0a 100644
--- a/src/ol/source/imagetilesource.js
+++ b/src/ol/source/imagetilesource.js
@@ -1,6 +1,7 @@
 goog.provide('ol.source.ImageTileSource');
 goog.provide('ol.source.ImageTileSourceOptions');
 
+goog.require('goog.asserts');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
 goog.require('ol.ImageTile');
diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js
index 63a681de82..abb4afa08b 100644
--- a/src/ol/source/stamensource.js
+++ b/src/ol/source/stamensource.js
@@ -1,5 +1,6 @@
 goog.provide('ol.source.Stamen');
 
+goog.require('goog.asserts');
 goog.require('ol.Attribution');
 goog.require('ol.source.XYZ');
 
diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js
index 35a27ca3e3..852847ab4a 100644
--- a/src/ol/source/tiledwmssource.js
+++ b/src/ol/source/tiledwmssource.js
@@ -2,8 +2,8 @@
 
 goog.provide('ol.source.TiledWMS');
 
-
 goog.require('goog.array');
+goog.require('goog.math');
 goog.require('ol.Extent');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js
index 29b8532e1f..7870c2deec 100644
--- a/src/ol/source/tilejsonsource.js
+++ b/src/ol/source/tilejsonsource.js
@@ -10,6 +10,7 @@ goog.provide('ol.source.TileJSON');
 goog.provide('ol.tilejson');
 
 goog.require('goog.asserts');
+goog.require('goog.math');
 goog.require('goog.net.jsloader');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
diff --git a/src/ol/source/wms.js b/src/ol/source/wms.js
index d81e822549..68c5cbe026 100644
--- a/src/ol/source/wms.js
+++ b/src/ol/source/wms.js
@@ -1,5 +1,8 @@
 goog.provide('ol.source.wms');
 
+goog.require('goog.object');
+goog.require('goog.uri.utils');
+
 
 /**
  * @param {string} baseUrl WMS base url.
diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js
index 7b44040945..f6da97ed6e 100644
--- a/src/ol/source/wmtssource.js
+++ b/src/ol/source/wmtssource.js
@@ -1,7 +1,11 @@
 goog.provide('ol.source.WMTS');
 goog.provide('ol.source.WMTSRequestEncoding');
 
-goog.require('ol.Attribution');
+goog.require('goog.array');
+goog.require('goog.asserts');
+goog.require('goog.math');
+goog.require('goog.object');
+goog.require('goog.uri.utils');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
diff --git a/src/ol/structs/buffer.js b/src/ol/structs/buffer.js
index 611c2e9e11..b4af5b4e8e 100644
--- a/src/ol/structs/buffer.js
+++ b/src/ol/structs/buffer.js
@@ -1,6 +1,7 @@
 goog.provide('ol.structs.Buffer');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('goog.webgl');
 goog.require('ol.structs.IntegerSet');
 
diff --git a/src/ol/structs/rtree.js b/src/ol/structs/rtree.js
index 8bf4d9e48f..e323cb1ef1 100644
--- a/src/ol/structs/rtree.js
+++ b/src/ol/structs/rtree.js
@@ -1,5 +1,6 @@
 goog.provide('ol.structs.RTree');
 
+goog.require('goog.object');
 goog.require('ol.Rectangle');
 
 
diff --git a/src/ol/style/icon.js b/src/ol/style/icon.js
index 16e2e90b34..b390bb67aa 100644
--- a/src/ol/style/icon.js
+++ b/src/ol/style/icon.js
@@ -2,6 +2,7 @@ goog.provide('ol.style.Icon');
 goog.provide('ol.style.IconLiteral');
 goog.provide('ol.style.IconType');
 
+goog.require('goog.asserts');
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
 goog.require('ol.style.Point');
diff --git a/src/ol/style/line.js b/src/ol/style/line.js
index 340181a256..1082396723 100644
--- a/src/ol/style/line.js
+++ b/src/ol/style/line.js
@@ -1,6 +1,7 @@
 goog.provide('ol.style.Line');
 goog.provide('ol.style.LineLiteral');
 
+goog.require('goog.asserts');
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
 goog.require('ol.style.Symbolizer');
diff --git a/src/ol/style/polygon.js b/src/ol/style/polygon.js
index ef2a017ec1..4b0daa0813 100644
--- a/src/ol/style/polygon.js
+++ b/src/ol/style/polygon.js
@@ -1,6 +1,7 @@
 goog.provide('ol.style.Polygon');
 goog.provide('ol.style.PolygonLiteral');
 
+goog.require('goog.asserts');
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
 goog.require('ol.style.Symbolizer');
diff --git a/src/ol/style/shape.js b/src/ol/style/shape.js
index d0af55a4d1..754c90feb6 100644
--- a/src/ol/style/shape.js
+++ b/src/ol/style/shape.js
@@ -2,6 +2,7 @@ goog.provide('ol.style.Shape');
 goog.provide('ol.style.ShapeLiteral');
 goog.provide('ol.style.ShapeType');
 
+goog.require('goog.asserts');
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
 goog.require('ol.style.Point');
diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js
index b939795662..755b65e063 100644
--- a/src/ol/tilegrid/wmtstilegrid.js
+++ b/src/ol/tilegrid/wmtstilegrid.js
@@ -1,5 +1,7 @@
 goog.provide('ol.tilegrid.WMTS');
 
+goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('ol.Size');
 goog.require('ol.projection');
 goog.require('ol.tilegrid.TileGrid');
diff --git a/src/ol/view.js b/src/ol/view.js
index 61fba43f46..862cde3c08 100644
--- a/src/ol/view.js
+++ b/src/ol/view.js
@@ -2,6 +2,7 @@ goog.provide('ol.View');
 goog.provide('ol.ViewHint');
 
 goog.require('goog.array');
+goog.require('goog.asserts');
 goog.require('ol.IView');
 goog.require('ol.Object');
 
diff --git a/src/ol/view2d.js b/src/ol/view2d.js
index 11318a6394..41b56f56bc 100644
--- a/src/ol/view2d.js
+++ b/src/ol/view2d.js
@@ -4,6 +4,7 @@
 goog.provide('ol.View2D');
 goog.provide('ol.View2DProperty');
 
+goog.require('goog.asserts');
 goog.require('ol.Constraints');
 goog.require('ol.Extent');
 goog.require('ol.IView2D');
diff --git a/src/ol/webgl/webgl.js b/src/ol/webgl/webgl.js
index d474e45f7d..0345159bb2 100644
--- a/src/ol/webgl/webgl.js
+++ b/src/ol/webgl/webgl.js
@@ -1,6 +1,9 @@
 goog.provide('ol.webgl');
 goog.provide('ol.webgl.WebGLContextEventType');
 
+goog.require('goog.dom');
+goog.require('goog.dom.TagName');
+
 
 /**
  * @const
diff --git a/test/spec/ol/collection.test.js b/test/spec/ol/collection.test.js
index faa9eacf89..d75f61457f 100644
--- a/test/spec/ol/collection.test.js
+++ b/test/spec/ol/collection.test.js
@@ -275,5 +275,7 @@ describe('ol.collection', function() {
 
 });
 
+
+goog.require('goog.events');
 goog.require('ol.Collection');
 goog.require('ol.CollectionEventType');
diff --git a/test/spec/ol/control/control.test.js b/test/spec/ol/control/control.test.js
index 3431b7503c..1f9e1de825 100644
--- a/test/spec/ol/control/control.test.js
+++ b/test/spec/ol/control/control.test.js
@@ -25,5 +25,6 @@ describe('ol.control.Control', function() {
 });
 
 goog.require('goog.dom');
+goog.require('goog.dom.TagName');
 goog.require('ol.Map');
 goog.require('ol.control.Control');
diff --git a/test/spec/ol/object.test.js b/test/spec/ol/object.test.js
index d51a01ec83..5245f8173c 100644
--- a/test/spec/ol/object.test.js
+++ b/test/spec/ol/object.test.js
@@ -475,4 +475,6 @@ describe('ol.Object', function() {
   });
 });
 
+
+goog.require('goog.events');
 goog.require('ol.Object');
diff --git a/test/spec/ol/projection/projection.test.js b/test/spec/ol/projection/projection.test.js
index 47557fca19..1f45a8bcc7 100644
--- a/test/spec/ol/projection/projection.test.js
+++ b/test/spec/ol/projection/projection.test.js
@@ -357,6 +357,7 @@ describe('ol.projection', function() {
 });
 
 goog.require('goog.array');
+goog.require('goog.asserts.AssertionError');
 goog.require('ol.Extent');
 goog.require('ol.Projection');
 goog.require('ol.ProjectionUnits');
diff --git a/test/spec/ol/sphere/sphere.test.js b/test/spec/ol/sphere/sphere.test.js
index 1120996c46..f212f3f5a7 100644
--- a/test/spec/ol/sphere/sphere.test.js
+++ b/test/spec/ol/sphere/sphere.test.js
@@ -547,4 +547,5 @@ describe('ol.Sphere', function() {
 });
 
 
+goog.require('goog.math');
 goog.require('ol.Sphere');
diff --git a/test/spec/ol/structs/integerset.test.js b/test/spec/ol/structs/integerset.test.js
index 48a8328dc7..ec4477ef5c 100644
--- a/test/spec/ol/structs/integerset.test.js
+++ b/test/spec/ol/structs/integerset.test.js
@@ -615,5 +615,6 @@ describe('ol.structs.IntegerSet', function() {
 
 
 goog.require('goog.array');
+goog.require('goog.math');
 goog.require('goog.object');
 goog.require('ol.structs.IntegerSet');
diff --git a/test/spec/ol/structs/rtree.test.js b/test/spec/ol/structs/rtree.test.js
index a4a87ad7a7..e982a5de8d 100644
--- a/test/spec/ol/structs/rtree.test.js
+++ b/test/spec/ol/structs/rtree.test.js
@@ -58,5 +58,6 @@ describe('ol.structs.RTree', function() {
 
 });
 
+goog.require('goog.object');
 goog.require('ol.Rectangle');
 goog.require('ol.structs.RTree');