diff --git a/src/ol/attribution.js b/src/ol/attribution.js
index 560e52facf..3c95c8b83d 100644
--- a/src/ol/attribution.js
+++ b/src/ol/attribution.js
@@ -21,6 +21,7 @@ goog.require('ol.TileRange');
  *
  * @constructor
  * @param {olx.AttributionOptions} options Attribution options.
+ * @struct
  * @todo stability experimental
  */
 ol.Attribution = function(options) {
diff --git a/src/ol/kinetic.js b/src/ol/kinetic.js
index 7bdbf1a3d4..56833aed1b 100644
--- a/src/ol/kinetic.js
+++ b/src/ol/kinetic.js
@@ -13,6 +13,7 @@ goog.require('ol.animation');
  * @param {number} minVelocity Minimum velocity (pixels/millisecond).
  * @param {number} delay Delay to consider to calculate the kinetic
  *     initial values (milliseconds).
+ * @struct
  * @todo stability experimental
  */
 ol.Kinetic = function(decay, minVelocity, delay) {
diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index 1a686a9282..bcb3f31e2d 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -59,6 +59,7 @@ ol.METERS_PER_UNIT[ol.proj.Units.METERS] = 1;
 /**
  * @constructor
  * @param {olx.ProjectionOptions} options Projection options.
+ * @struct
  * @todo stability experimental
  */
 ol.proj.Projection = function(options) {
@@ -200,6 +201,7 @@ ol.proj.Projection.prototype.setDefaultTileGrid = function(tileGrid) {
  * @param {Proj4js.Proj} proj4jsProj Proj4js projection.
  * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
  * @private
+ * @struct
  */
 ol.Proj4jsProjection_ = function(proj4jsProj, options) {
 
diff --git a/src/ol/renderer/webgl/webglmapcolorshader.js b/src/ol/renderer/webgl/webglmapcolorshader.js
index 44bc6f212e..eeff8162d2 100644
--- a/src/ol/renderer/webgl/webglmapcolorshader.js
+++ b/src/ol/renderer/webgl/webglmapcolorshader.js
@@ -8,6 +8,7 @@ goog.require('ol.webgl.shader');
 /**
  * @constructor
  * @extends {ol.webgl.shader.Fragment}
+ * @struct
  */
 ol.renderer.webgl.map.shader.ColorFragment = function() {
   goog.base(this, ol.renderer.webgl.map.shader.ColorFragment.SOURCE);
@@ -43,6 +44,7 @@ ol.renderer.webgl.map.shader.ColorFragment.SOURCE = goog.DEBUG ?
 /**
  * @constructor
  * @extends {ol.webgl.shader.Vertex}
+ * @struct
  */
 ol.renderer.webgl.map.shader.ColorVertex = function() {
   goog.base(this, ol.renderer.webgl.map.shader.ColorVertex.SOURCE);
@@ -79,6 +81,7 @@ ol.renderer.webgl.map.shader.ColorVertex.SOURCE = goog.DEBUG ?
  * @constructor
  * @param {WebGLRenderingContext} gl GL.
  * @param {WebGLProgram} program Program.
+ * @struct
  */
 ol.renderer.webgl.map.shader.Color.Locations = function(gl, program) {
 
diff --git a/src/ol/renderer/webgl/webglmapdefaultshader.js b/src/ol/renderer/webgl/webglmapdefaultshader.js
index 8cf05e438f..47aff44a22 100644
--- a/src/ol/renderer/webgl/webglmapdefaultshader.js
+++ b/src/ol/renderer/webgl/webglmapdefaultshader.js
@@ -8,6 +8,7 @@ goog.require('ol.webgl.shader');
 /**
  * @constructor
  * @extends {ol.webgl.shader.Fragment}
+ * @struct
  */
 ol.renderer.webgl.map.shader.DefaultFragment = function() {
   goog.base(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE);
@@ -43,6 +44,7 @@ ol.renderer.webgl.map.shader.DefaultFragment.SOURCE = goog.DEBUG ?
 /**
  * @constructor
  * @extends {ol.webgl.shader.Vertex}
+ * @struct
  */
 ol.renderer.webgl.map.shader.DefaultVertex = function() {
   goog.base(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE);
@@ -79,6 +81,7 @@ ol.renderer.webgl.map.shader.DefaultVertex.SOURCE = goog.DEBUG ?
  * @constructor
  * @param {WebGLRenderingContext} gl GL.
  * @param {WebGLProgram} program Program.
+ * @struct
  */
 ol.renderer.webgl.map.shader.Default.Locations = function(gl, program) {
 
diff --git a/src/ol/renderer/webgl/webgltilelayershader.js b/src/ol/renderer/webgl/webgltilelayershader.js
index 8d8169042c..6cbb58103b 100644
--- a/src/ol/renderer/webgl/webgltilelayershader.js
+++ b/src/ol/renderer/webgl/webgltilelayershader.js
@@ -8,6 +8,7 @@ goog.require('ol.webgl.shader');
 /**
  * @constructor
  * @extends {ol.webgl.shader.Fragment}
+ * @struct
  */
 ol.renderer.webgl.tilelayer.shader.Fragment = function() {
   goog.base(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE);
@@ -43,6 +44,7 @@ ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE = goog.DEBUG ?
 /**
  * @constructor
  * @extends {ol.webgl.shader.Vertex}
+ * @struct
  */
 ol.renderer.webgl.tilelayer.shader.Vertex = function() {
   goog.base(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE);
@@ -79,6 +81,7 @@ ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE = goog.DEBUG ?
  * @constructor
  * @param {WebGLRenderingContext} gl GL.
  * @param {WebGLProgram} program Program.
+ * @struct
  */
 ol.renderer.webgl.tilelayer.shader.Locations = function(gl, program) {
 
diff --git a/src/ol/structs/buffer.js b/src/ol/structs/buffer.js
index 1a3aad615f..b18052ffe3 100644
--- a/src/ol/structs/buffer.js
+++ b/src/ol/structs/buffer.js
@@ -28,6 +28,7 @@ ol.BUFFER_REPLACE_UNUSED_ENTRIES_WITH_NANS = goog.DEBUG;
  * @param {Array.<number>=} opt_arr Array.
  * @param {number=} opt_used Used.
  * @param {number=} opt_usage Usage.
+ * @struct
  * @todo stability experimental
  */
 ol.structs.Buffer = function(opt_arr, opt_used, opt_usage) {
diff --git a/src/ol/structs/integerset.js b/src/ol/structs/integerset.js
index 17fc2ebc53..dc292443eb 100644
--- a/src/ol/structs/integerset.js
+++ b/src/ol/structs/integerset.js
@@ -9,6 +9,7 @@ goog.require('goog.asserts');
  * This implementation is designed for the case when the number of distinct
  * integer ranges is small.
  * @constructor
+ * @struct
  * @param {Array.<number>=} opt_arr Array.
  */
 ol.structs.IntegerSet = function(opt_arr) {
diff --git a/src/ol/structs/lrucache.js b/src/ol/structs/lrucache.js
index 12e8e5d49c..3fc7a2427d 100644
--- a/src/ol/structs/lrucache.js
+++ b/src/ol/structs/lrucache.js
@@ -10,6 +10,7 @@ goog.require('goog.object');
  * Object's properties (e.g. 'hasOwnProperty' is not allowed as a key). Expiring
  * items from the cache is the responsibility of the user.
  * @constructor
+ * @struct
  * @template T
  */
 ol.structs.LRUCache = function() {
diff --git a/src/ol/structs/priorityqueue.js b/src/ol/structs/priorityqueue.js
index b303d6c64c..72b4019475 100644
--- a/src/ol/structs/priorityqueue.js
+++ b/src/ol/structs/priorityqueue.js
@@ -17,6 +17,7 @@ goog.require('goog.object');
  * @constructor
  * @param {function(T): number} priorityFunction Priority function.
  * @param {function(T): string} keyFunction Key function.
+ * @struct
  * @template T
  */
 ol.structs.PriorityQueue = function(priorityFunction, keyFunction) {
diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js
index 3be4c3a03b..8f45d27cb6 100644
--- a/src/ol/structs/rbush.js
+++ b/src/ol/structs/rbush.js
@@ -36,6 +36,7 @@ goog.require('ol.extent');
  * @param {number} height Height.
  * @param {Array.<ol.structs.RBushNode.<T>>} children Children.
  * @param {?T} value Value.
+ * @struct
  * @template T
  */
 ol.structs.RBushNode = function(extent, height, children, value) {
@@ -160,6 +161,7 @@ ol.structs.RBushNode.prototype.isLeaf = function() {
  * @constructor
  * @param {number=} opt_maxEntries Max entries.
  * @see https://github.com/mourner/rbush
+ * @struct
  * @template T
  */
 ol.structs.RBush = function(opt_maxEntries) {
diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js
index baca04fb4a..643ed75ce9 100644
--- a/src/ol/tilecache.js
+++ b/src/ol/tilecache.js
@@ -18,6 +18,7 @@ ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK = 2048;
  * @constructor
  * @extends {ol.structs.LRUCache.<ol.Tile>}
  * @param {number=} opt_highWaterMark High water mark.
+ * @struct
  */
 ol.TileCache = function(opt_highWaterMark) {
 
diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js
index 08ee4e4614..36950abc08 100644
--- a/src/ol/tilegrid/tilegrid.js
+++ b/src/ol/tilegrid/tilegrid.js
@@ -28,6 +28,7 @@ ol.DEFAULT_MAX_ZOOM = 42;
 /**
  * @constructor
  * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
+ * @struct
  * @todo stability experimental
  */
 ol.tilegrid.TileGrid = function(options) {
diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js
index 3393aced51..e91427a43a 100644
--- a/src/ol/tilegrid/wmtstilegrid.js
+++ b/src/ol/tilegrid/wmtstilegrid.js
@@ -11,6 +11,7 @@ goog.require('ol.tilegrid.TileGrid');
  * @constructor
  * @extends {ol.tilegrid.TileGrid}
  * @param {olx.tilegrid.WMTSOptions} options WMTS options.
+ * @struct
  * @todo stability experimental
  */
 ol.tilegrid.WMTS = function(options) {
diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js
index 6325d3602b..239e282bc8 100644
--- a/src/ol/tilegrid/xyztilegrid.js
+++ b/src/ol/tilegrid/xyztilegrid.js
@@ -13,6 +13,7 @@ goog.require('ol.tilegrid.TileGrid');
  * @constructor
  * @extends {ol.tilegrid.TileGrid}
  * @param {olx.tilegrid.XYZOptions} options XYZ options.
+ * @struct
  * @todo stability experimental
  */
 ol.tilegrid.XYZ = function(options) {
diff --git a/src/ol/tilequeue.js b/src/ol/tilequeue.js
index 57d0791caa..e0426a5cb4 100644
--- a/src/ol/tilequeue.js
+++ b/src/ol/tilequeue.js
@@ -22,6 +22,7 @@ ol.TilePriorityFunction;
  *     Tile priority function.
  * @param {function(): ?} tileChangeCallback
  *     Function called on each tile change event.
+ * @struct
  */
 ol.TileQueue = function(tilePriorityFunction, tileChangeCallback) {
 
diff --git a/src/ol/tilerange.js b/src/ol/tilerange.js
index a53723ed53..cf09683c53 100644
--- a/src/ol/tilerange.js
+++ b/src/ol/tilerange.js
@@ -15,6 +15,7 @@ goog.require('ol.TileCoord');
  * @param {number} maxX Maximum X.
  * @param {number} minY Minimum Y.
  * @param {number} maxY Maximum Y.
+ * @struct
  */
 ol.TileRange = function(minX, maxX, minY, maxY) {
 
diff --git a/src/ol/webgl/shader.js b/src/ol/webgl/shader.js
index a06fd5c401..f9a2271724 100644
--- a/src/ol/webgl/shader.js
+++ b/src/ol/webgl/shader.js
@@ -9,6 +9,7 @@ goog.require('ol.webgl');
 /**
  * @constructor
  * @param {string} source Source.
+ * @struct
  */
 ol.webgl.Shader = function(source) {
 
@@ -46,6 +47,7 @@ ol.webgl.Shader.prototype.isAnimated = goog.functions.FALSE;
  * @constructor
  * @extends {ol.webgl.Shader}
  * @param {string} source Source.
+ * @struct
  */
 ol.webgl.shader.Fragment = function(source) {
   goog.base(this, source);
@@ -66,6 +68,7 @@ ol.webgl.shader.Fragment.prototype.getType = function() {
  * @constructor
  * @extends {ol.webgl.Shader}
  * @param {string} source Source.
+ * @struct
  */
 ol.webgl.shader.Vertex = function(source) {
   goog.base(this, source);
diff --git a/src/ol/webgl/shader.mustache b/src/ol/webgl/shader.mustache
index 14ecdd6947..ed62dc9718 100644
--- a/src/ol/webgl/shader.mustache
+++ b/src/ol/webgl/shader.mustache
@@ -8,6 +8,7 @@ goog.require('ol.webgl.shader');
 /**
  * @constructor
  * @extends {ol.webgl.shader.Fragment}
+ * @struct
  */
 {{className}}Fragment = function() {
   goog.base(this, {{className}}Fragment.SOURCE);
@@ -43,6 +44,7 @@ goog.addSingletonGetter({{className}}Fragment);
 /**
  * @constructor
  * @extends {ol.webgl.shader.Vertex}
+ * @struct
  */
 {{className}}Vertex = function() {
   goog.base(this, {{className}}Vertex.SOURCE);
@@ -79,6 +81,7 @@ goog.addSingletonGetter({{className}}Vertex);
  * @constructor
  * @param {WebGLRenderingContext} gl GL.
  * @param {WebGLProgram} program Program.
+ * @struct
  */
 {{namespace}}.Locations = function(gl, program) {
 {{#getUniforms}}