diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js
index 48a2a8e705..8fd2740bad 100644
--- a/src/ol/layer/Base.js
+++ b/src/ol/layer/Base.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/layer/Base
  */
-import {inherits} from '../util.js';
 import BaseObject from '../Object.js';
 import LayerProperty from '../layer/Property.js';
 import {clamp} from '../math.js';
diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js
index 4b68fb48b3..8c6ce1fae3 100644
--- a/src/ol/layer/Group.js
+++ b/src/ol/layer/Group.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/layer/Group
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import Collection from '../Collection.js';
 import CollectionEventType from '../CollectionEventType.js';
 import {getChangeEventType} from '../Object.js';
@@ -105,7 +105,7 @@ class LayerGroup extends BaseLayer {
    * @param {module:ol/events/Event} event Event.
    * @private
    */
-  handleLayersChanged_(event) {
+  handleLayersChanged_() {
     this.layersListenerKeys_.forEach(unlistenByKey);
     this.layersListenerKeys_.length = 0;
 
diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js
index 7df2be2043..17ee8a1914 100644
--- a/src/ol/layer/Heatmap.js
+++ b/src/ol/layer/Heatmap.js
@@ -2,7 +2,6 @@
  * @module ol/layer/Heatmap
  */
 import {listen} from '../events.js';
-import {inherits} from '../util.js';
 import {getChangeEventType} from '../Object.js';
 import {createCanvasContext2D} from '../dom.js';
 import VectorLayer from '../layer/Vector.js';
diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index 9828ab8043..e3aac7a201 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/layer/Image
  */
-import {inherits} from '../util.js';
 import LayerType from '../LayerType.js';
 import Layer from '../layer/Layer.js';
 
diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js
index aff9ea4495..f93399eacc 100644
--- a/src/ol/layer/Layer.js
+++ b/src/ol/layer/Layer.js
@@ -3,7 +3,7 @@
  */
 import {listen, unlistenByKey} from '../events.js';
 import EventType from '../events/EventType.js';
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import {getChangeEventType} from '../Object.js';
 import BaseLayer from '../layer/Base.js';
 import LayerProperty from '../layer/Property.js';
diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js
index ba74bb3311..ee5b078275 100644
--- a/src/ol/layer/Tile.js
+++ b/src/ol/layer/Tile.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/layer/Tile
  */
-import {inherits} from '../util.js';
 import LayerType from '../LayerType.js';
 import Layer from '../layer/Layer.js';
 import TileProperty from '../layer/TileProperty.js';
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index 5ddcdc5b19..e1ebfcc451 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/layer/Vector
  */
-import {inherits} from '../util.js';
 import LayerType from '../LayerType.js';
 import Layer from '../layer/Layer.js';
 import VectorRenderType from '../layer/VectorRenderType.js';
diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js
index 0afe3ed466..33b29d5f2b 100644
--- a/src/ol/layer/VectorTile.js
+++ b/src/ol/layer/VectorTile.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/layer/VectorTile
  */
-import {inherits} from '../util.js';
 import LayerType from '../LayerType.js';
 import {assert} from '../asserts.js';
 import TileProperty from '../layer/TileProperty.js';
diff --git a/src/ol/render/Box.js b/src/ol/render/Box.js
index f51afd682b..2831998822 100644
--- a/src/ol/render/Box.js
+++ b/src/ol/render/Box.js
@@ -1,9 +1,7 @@
 /**
  * @module ol/render/Box
  */
-// FIXME add rotation
 
-import {inherits} from '../util.js';
 import Disposable from '../Disposable.js';
 import Polygon from '../geom/Polygon.js';
 
diff --git a/src/ol/render/Event.js b/src/ol/render/Event.js
index 4bab695a7d..565e1c10e7 100644
--- a/src/ol/render/Event.js
+++ b/src/ol/render/Event.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/Event
  */
-import {inherits} from '../util.js';
+
 import Event from '../events/Event.js';
 
 class RenderEvent extends Event {
diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js
index c348f22e7d..9d48125380 100644
--- a/src/ol/render/canvas/ImageReplay.js
+++ b/src/ol/render/canvas/ImageReplay.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/render/canvas/ImageReplay
  */
-import {inherits} from '../../util.js';
 import CanvasInstruction from '../canvas/Instruction.js';
 import CanvasReplay from '../canvas/Replay.js';
 
diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js
index dcc26ceace..4fc556293f 100644
--- a/src/ol/render/canvas/Immediate.js
+++ b/src/ol/render/canvas/Immediate.js
@@ -5,7 +5,6 @@
 // FIXME need to handle large thick features (where pixel size matters)
 // FIXME add offset and end to ol/geom/flat/transform~transform2D?
 
-import {inherits} from '../../util.js';
 import {equals} from '../../array.js';
 import {asColorLike} from '../../colorlike.js';
 import {intersects} from '../../extent.js';
diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js
index c16abb9f57..d63b2ea101 100644
--- a/src/ol/render/canvas/LineStringReplay.js
+++ b/src/ol/render/canvas/LineStringReplay.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/render/canvas/LineStringReplay
  */
-import {inherits} from '../../util.js';
 import CanvasInstruction, {strokeInstruction, beginPathInstruction} from '../canvas/Instruction.js';
 import CanvasReplay from '../canvas/Replay.js';
 
diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js
index 50c90e0aed..1b7f99d470 100644
--- a/src/ol/render/canvas/PolygonReplay.js
+++ b/src/ol/render/canvas/PolygonReplay.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/render/canvas/PolygonReplay
  */
-import {inherits} from '../../util.js';
 import {asString} from '../../color.js';
 import {snap} from '../../geom/flat/simplify.js';
 import {defaultFillStyle} from '../canvas.js';
diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js
index 8057993bf0..f3c3a1d6d4 100644
--- a/src/ol/render/canvas/Replay.js
+++ b/src/ol/render/canvas/Replay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/canvas/Replay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {UNDEFINED} from '../../functions.js';
 import {equals, reverseSubArray} from '../../array.js';
 import {asColorLike} from '../../colorlike.js';
diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js
index 53077b3cfc..8c6523ece2 100644
--- a/src/ol/render/canvas/ReplayGroup.js
+++ b/src/ol/render/canvas/ReplayGroup.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/canvas/ReplayGroup
  */
-import {inherits} from '../../util.js';
+
 import {numberSafeCompareFunction} from '../../array.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {buffer, createEmpty, extendCoordinate} from '../../extent.js';
diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js
index 5c9db8771d..f6f81b6740 100644
--- a/src/ol/render/canvas/TextReplay.js
+++ b/src/ol/render/canvas/TextReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/canvas/TextReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {asColorLike} from '../../colorlike.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {intersects} from '../../extent.js';
diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js
index 1a7f02f8c7..f358f3e112 100644
--- a/src/ol/render/webgl/CircleReplay.js
+++ b/src/ol/render/webgl/CircleReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/CircleReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {equals} from '../../array.js';
 import {asArray} from '../../color.js';
 import {intersects} from '../../extent.js';
diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js
index 4570ab2da0..092448f319 100644
--- a/src/ol/render/webgl/ImageReplay.js
+++ b/src/ol/render/webgl/ImageReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/ImageReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import WebGLTextureReplay from '../webgl/TextureReplay.js';
 import WebGLBuffer from '../../webgl/Buffer.js';
 
diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js
index 415e7779bd..adb49bbbb3 100644
--- a/src/ol/render/webgl/Immediate.js
+++ b/src/ol/render/webgl/Immediate.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/Immediate
  */
-import {inherits} from '../../util.js';
+
 import {intersects} from '../../extent.js';
 import GeometryType from '../../geom/GeometryType.js';
 import ReplayType from '../ReplayType.js';
diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js
index bd089f0a4e..678a2ae79e 100644
--- a/src/ol/render/webgl/LineStringReplay.js
+++ b/src/ol/render/webgl/LineStringReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/LineStringReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {equals} from '../../array.js';
 import {asArray} from '../../color.js';
 import {intersects} from '../../extent.js';
diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js
index 424b97ee60..8d02dd5af0 100644
--- a/src/ol/render/webgl/PolygonReplay.js
+++ b/src/ol/render/webgl/PolygonReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/PolygonReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {equals} from '../../array.js';
 import {asArray} from '../../color.js';
 import {intersects} from '../../extent.js';
diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js
index 743fcce134..6697a968dc 100644
--- a/src/ol/render/webgl/Replay.js
+++ b/src/ol/render/webgl/Replay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/Replay
  */
-import {inherits} from '../../util.js';
+
 import {getCenter} from '../../extent.js';
 import VectorContext from '../VectorContext.js';
 import {
diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js
index 0a18839434..660fa2975c 100644
--- a/src/ol/render/webgl/ReplayGroup.js
+++ b/src/ol/render/webgl/ReplayGroup.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/ReplayGroup
  */
-import {inherits} from '../../util.js';
+
 import {numberSafeCompareFunction} from '../../array.js';
 import {buffer, createOrUpdateFromCoordinate} from '../../extent.js';
 import {isEmpty} from '../../obj.js';
diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js
index 2d9214fab1..b36a276ef4 100644
--- a/src/ol/render/webgl/TextReplay.js
+++ b/src/ol/render/webgl/TextReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/TextReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {asColorLike} from '../../colorlike.js';
 import {createCanvasContext2D} from '../../dom.js';
 import GeometryType from '../../geom/GeometryType.js';
diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js
index f2d95a2eed..b7c58753a7 100644
--- a/src/ol/render/webgl/TextureReplay.js
+++ b/src/ol/render/webgl/TextureReplay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/webgl/TextureReplay
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import {intersects} from '../../extent.js';
 import {isEmpty} from '../../obj.js';
 import {fragment, vertex} from '../webgl/texturereplay/defaultshader.js';
diff --git a/src/ol/reproj/Image.js b/src/ol/reproj/Image.js
index d084b46064..7c68e098dd 100644
--- a/src/ol/reproj/Image.js
+++ b/src/ol/reproj/Image.js
@@ -2,7 +2,7 @@
  * @module ol/reproj/Image
  */
 import {ERROR_THRESHOLD} from './common.js';
-import {inherits} from '../util.js';
+
 import ImageBase from '../ImageBase.js';
 import ImageState from '../ImageState.js';
 import {listen, unlistenByKey} from '../events.js';
diff --git a/src/ol/reproj/Tile.js b/src/ol/reproj/Tile.js
index a038169edf..a02d4b7606 100644
--- a/src/ol/reproj/Tile.js
+++ b/src/ol/reproj/Tile.js
@@ -2,7 +2,7 @@
  * @module ol/reproj/Tile
  */
 import {ERROR_THRESHOLD} from './common.js';
-import {inherits} from '../util.js';
+
 import Tile from '../Tile.js';
 import TileState from '../TileState.js';
 import {listen, unlistenByKey} from '../events.js';
diff --git a/src/ol/source/BingMaps.js b/src/ol/source/BingMaps.js
index de5ef5f186..d8813f815c 100644
--- a/src/ol/source/BingMaps.js
+++ b/src/ol/source/BingMaps.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/BingMaps
  */
-import {inherits} from '../util.js';
+
 import {createFromTileUrlFunctions} from '../tileurlfunction.js';
 import {applyTransform, intersects} from '../extent.js';
 import {jsonp as requestJSONP} from '../net.js';
diff --git a/src/ol/source/CartoDB.js b/src/ol/source/CartoDB.js
index 50eb652b8a..301c21d339 100644
--- a/src/ol/source/CartoDB.js
+++ b/src/ol/source/CartoDB.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/CartoDB
  */
-import {inherits} from '../util.js';
+
 import {assign} from '../obj.js';
 import SourceState from '../source/State.js';
 import XYZ from '../source/XYZ.js';
diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js
index 8aad86687e..48eaaf5a9d 100644
--- a/src/ol/source/Cluster.js
+++ b/src/ol/source/Cluster.js
@@ -2,7 +2,7 @@
  * @module ol/source/Cluster
  */
 
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import {assert} from '../asserts.js';
 import Feature from '../Feature.js';
 import {scale as scaleCoordinate, add as addCoordinate} from '../coordinate.js';
diff --git a/src/ol/source/Image.js b/src/ol/source/Image.js
index 36e5bcc7e4..1a0a27172f 100644
--- a/src/ol/source/Image.js
+++ b/src/ol/source/Image.js
@@ -2,7 +2,7 @@
  * @module ol/source/Image
  */
 import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js';
-import {inherits} from '../util.js';
+
 import ImageState from '../ImageState.js';
 import {linearFindNearest} from '../array.js';
 import Event from '../events/Event.js';
diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js
index 3a0653109d..9bd9b4a011 100644
--- a/src/ol/source/ImageArcGISRest.js
+++ b/src/ol/source/ImageArcGISRest.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/ImageArcGISRest
  */
-import {inherits} from '../util.js';
+
 import ImageWrapper from '../Image.js';
 import {assert} from '../asserts.js';
 import {listen} from '../events.js';
diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js
index 94de3a60f1..eee6f6a6dd 100644
--- a/src/ol/source/ImageCanvas.js
+++ b/src/ol/source/ImageCanvas.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/ImageCanvas
  */
-import {inherits} from '../util.js';
+
 import ImageCanvas from '../ImageCanvas.js';
 import {containsExtent, getHeight, getWidth, scaleFromCenter} from '../extent.js';
 import ImageSource from '../source/Image.js';
diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js
index 40939982e2..115e764576 100644
--- a/src/ol/source/ImageMapGuide.js
+++ b/src/ol/source/ImageMapGuide.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/ImageMapGuide
  */
-import {inherits} from '../util.js';
+
 import ImageWrapper from '../Image.js';
 import {listen} from '../events.js';
 import EventType from '../events/EventType.js';
diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js
index 5d33692d2b..11ea42ea44 100644
--- a/src/ol/source/ImageStatic.js
+++ b/src/ol/source/ImageStatic.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/ImageStatic
  */
-import {inherits} from '../util.js';
+
 import ImageWrapper from '../Image.js';
 import ImageState from '../ImageState.js';
 import {createCanvasContext2D} from '../dom.js';
diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js
index 3594392b28..fd8f80cc5e 100644
--- a/src/ol/source/ImageWMS.js
+++ b/src/ol/source/ImageWMS.js
@@ -3,7 +3,7 @@
  */
 
 import {DEFAULT_WMS_VERSION} from './common.js';
-import {inherits} from '../util.js';
+
 import ImageWrapper from '../Image.js';
 import {assert} from '../asserts.js';
 import {listen} from '../events.js';
diff --git a/src/ol/source/OSM.js b/src/ol/source/OSM.js
index 85183bf441..d551190299 100644
--- a/src/ol/source/OSM.js
+++ b/src/ol/source/OSM.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/OSM
  */
-import {inherits} from '../util.js';
+
 import XYZ from '../source/XYZ.js';
 
 
diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js
index 852cf90763..9526dd7d61 100644
--- a/src/ol/source/Raster.js
+++ b/src/ol/source/Raster.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/Raster
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import ImageCanvas from '../ImageCanvas.js';
 import TileQueue from '../TileQueue.js';
 import {createCanvasContext2D} from '../dom.js';
diff --git a/src/ol/source/Source.js b/src/ol/source/Source.js
index 84930b9afb..468d7c71b8 100644
--- a/src/ol/source/Source.js
+++ b/src/ol/source/Source.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/Source
  */
-import {inherits} from '../util.js';
+
 import {UNDEFINED} from '../functions.js';
 import BaseObject from '../Object.js';
 import {get as getProjection} from '../proj.js';
diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js
index c75353f459..6a23d12c27 100644
--- a/src/ol/source/Stamen.js
+++ b/src/ol/source/Stamen.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/Stamen
  */
-import {inherits} from '../util.js';
+
 import {ATTRIBUTION as OSM_ATTRIBUTION} from '../source/OSM.js';
 import XYZ from '../source/XYZ.js';
 
diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js
index fd8623d7c9..427f3e547b 100644
--- a/src/ol/source/Tile.js
+++ b/src/ol/source/Tile.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/Tile
  */
-import {inherits} from '../util.js';
+
 import {UNDEFINED} from '../functions.js';
 import TileCache from '../TileCache.js';
 import TileState from '../TileState.js';
diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js
index a276b98326..d4e83a4a64 100644
--- a/src/ol/source/TileArcGISRest.js
+++ b/src/ol/source/TileArcGISRest.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/TileArcGISRest
  */
-import {inherits} from '../util.js';
+
 import {createEmpty} from '../extent.js';
 import {modulo} from '../math.js';
 import {assign} from '../obj.js';
diff --git a/src/ol/source/TileDebug.js b/src/ol/source/TileDebug.js
index 07632b58a9..44033c6c69 100644
--- a/src/ol/source/TileDebug.js
+++ b/src/ol/source/TileDebug.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/TileDebug
  */
-import {inherits} from '../util.js';
+
 import Tile from '../Tile.js';
 import TileState from '../TileState.js';
 import {createCanvasContext2D} from '../dom.js';
diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js
index 7e79507743..d822e37fe6 100644
--- a/src/ol/source/TileImage.js
+++ b/src/ol/source/TileImage.js
@@ -2,7 +2,7 @@
  * @module ol/source/TileImage
  */
 import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js';
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import ImageTile from '../ImageTile.js';
 import TileCache from '../TileCache.js';
 import TileState from '../TileState.js';
diff --git a/src/ol/source/TileJSON.js b/src/ol/source/TileJSON.js
index 354ecaadcd..5bb800fbd9 100644
--- a/src/ol/source/TileJSON.js
+++ b/src/ol/source/TileJSON.js
@@ -7,7 +7,7 @@
  * @see http://mapbox.com/developers/api/
  */
 
-import {inherits} from '../util.js';
+
 import {createFromTemplates} from '../tileurlfunction.js';
 import {assert} from '../asserts.js';
 import {applyTransform, intersects} from '../extent.js';
diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js
index 849f4e1da1..890b1a157b 100644
--- a/src/ol/source/TileWMS.js
+++ b/src/ol/source/TileWMS.js
@@ -3,7 +3,7 @@
  */
 
 import {DEFAULT_WMS_VERSION} from './common.js';
-import {inherits} from '../util.js';
+
 import {assert} from '../asserts.js';
 import {buffer, createEmpty} from '../extent.js';
 import {assign} from '../obj.js';
diff --git a/src/ol/source/UTFGrid.js b/src/ol/source/UTFGrid.js
index f763ec3e19..37619a55b8 100644
--- a/src/ol/source/UTFGrid.js
+++ b/src/ol/source/UTFGrid.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/UTFGrid
  */
-import {inherits} from '../util.js';
+
 import Tile from '../Tile.js';
 import TileState from '../TileState.js';
 import {createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js';
diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js
index b19f558f77..073698bbd4 100644
--- a/src/ol/source/UrlTile.js
+++ b/src/ol/source/UrlTile.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/UrlTile
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import TileState from '../TileState.js';
 import {expandUrl, createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js';
 import TileSource, {TileSourceEvent} from '../source/Tile.js';
diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js
index 3ef13cb11d..90bf0fdd1d 100644
--- a/src/ol/source/Vector.js
+++ b/src/ol/source/Vector.js
@@ -2,7 +2,7 @@
  * @module ol/source/Vector
  */
 
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import Collection from '../Collection.js';
 import CollectionEventType from '../CollectionEventType.js';
 import ObjectEventType from '../ObjectEventType.js';
diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js
index e1c1158596..31b4ef8a1b 100644
--- a/src/ol/source/VectorTile.js
+++ b/src/ol/source/VectorTile.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/VectorTile
  */
-import {inherits} from '../util.js';
+
 import TileState from '../TileState.js';
 import VectorImageTile, {defaultLoadFunction} from '../VectorImageTile.js';
 import Tile from '../VectorTile.js';
diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js
index f309b09d53..d418f96386 100644
--- a/src/ol/source/WMTS.js
+++ b/src/ol/source/WMTS.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/WMTS
  */
-import {inherits} from '../util.js';
+
 import {expandUrl, createFromTileUrlFunctions, nullTileUrlFunction} from '../tileurlfunction.js';
 import {find, findIndex, includes} from '../array.js';
 import {containsExtent} from '../extent.js';
diff --git a/src/ol/source/XYZ.js b/src/ol/source/XYZ.js
index b5a1590485..fbc9cc756d 100644
--- a/src/ol/source/XYZ.js
+++ b/src/ol/source/XYZ.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/source/XYZ
  */
-import {inherits} from '../util.js';
+
 import TileImage from '../source/TileImage.js';
 import {createXYZ, extentFromProjection} from '../tilegrid.js';
 
diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js
index b8a0818d51..f1e7ed9878 100644
--- a/src/ol/source/Zoomify.js
+++ b/src/ol/source/Zoomify.js
@@ -2,7 +2,7 @@
  * @module ol/source/Zoomify
  */
 import {DEFAULT_TILE_SIZE} from '../tilegrid/common.js';
-import {inherits} from '../util.js';
+
 import ImageTile from '../ImageTile.js';
 import TileState from '../TileState.js';
 import {expandUrl, createFromTileUrlFunctions} from '../tileurlfunction.js';
diff --git a/src/ol/structs/LRUCache.js b/src/ol/structs/LRUCache.js
index e3a90ec94e..2c4dff5798 100644
--- a/src/ol/structs/LRUCache.js
+++ b/src/ol/structs/LRUCache.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/structs/LRUCache
  */
-import {inherits} from '../util.js';
+
 import {assert} from '../asserts.js';
 import EventTarget from '../events/EventTarget.js';
 import EventType from '../events/EventType.js';
diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js
index a79fbc7c9c..9e6d91c9ef 100644
--- a/src/ol/style/Circle.js
+++ b/src/ol/style/Circle.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/style/Circle
  */
-import {inherits} from '../util.js';
+
 import RegularShape from '../style/RegularShape.js';
 
 
diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js
index 715125fa27..8eb05223d2 100644
--- a/src/ol/style/Icon.js
+++ b/src/ol/style/Icon.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/style/Icon
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import ImageState from '../ImageState.js';
 import {assert} from '../asserts.js';
 import {asArray} from '../color.js';
diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js
index 194eb443c1..34c148f199 100644
--- a/src/ol/style/IconImage.js
+++ b/src/ol/style/IconImage.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/style/IconImage
  */
-import {inherits} from '../util.js';
+
 import {createCanvasContext2D} from '../dom.js';
 import {listenOnce, unlistenByKey} from '../events.js';
 import EventTarget from '../events/EventTarget.js';
diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js
index c3efe8bca2..ca70d7508b 100644
--- a/src/ol/style/RegularShape.js
+++ b/src/ol/style/RegularShape.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/style/RegularShape
  */
-import {inherits} from '../util.js';
+
 import {asColorLike} from '../colorlike.js';
 import {createCanvasContext2D} from '../dom.js';
 import {CANVAS_LINE_DASH} from '../has.js';
diff --git a/src/ol/tilegrid/WMTS.js b/src/ol/tilegrid/WMTS.js
index 972b357017..f9245390db 100644
--- a/src/ol/tilegrid/WMTS.js
+++ b/src/ol/tilegrid/WMTS.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/tilegrid/WMTS
  */
-import {inherits} from '../util.js';
+
 import {find} from '../array.js';
 import {get as getProjection} from '../proj.js';
 import TileGrid from '../tilegrid/TileGrid.js';
diff --git a/src/ol/webgl/Context.js b/src/ol/webgl/Context.js
index bb90bf3ee9..2c313263a3 100644
--- a/src/ol/webgl/Context.js
+++ b/src/ol/webgl/Context.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/webgl/Context
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import {EXTENSIONS as WEBGL_EXTENSIONS} from '../webgl.js';
 import Disposable from '../Disposable.js';
 import {includes} from '../array.js';
diff --git a/src/ol/webgl/Fragment.js b/src/ol/webgl/Fragment.js
index 3b27053d40..e96a853502 100644
--- a/src/ol/webgl/Fragment.js
+++ b/src/ol/webgl/Fragment.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/webgl/Fragment
  */
-import {inherits} from '../util.js';
+
 import {FRAGMENT_SHADER} from '../webgl.js';
 import WebGLShader from '../webgl/Shader.js';
 
diff --git a/src/ol/webgl/Vertex.js b/src/ol/webgl/Vertex.js
index 494b972387..746d871319 100644
--- a/src/ol/webgl/Vertex.js
+++ b/src/ol/webgl/Vertex.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/webgl/Vertex
  */
-import {inherits} from '../util.js';
+
 import {VERTEX_SHADER} from '../webgl.js';
 import WebGLShader from '../webgl/Shader.js';