diff --git a/src/objectliterals.exports b/src/objectliterals.exports
index 9ba2c520b3..171672ef67 100644
--- a/src/objectliterals.exports
+++ b/src/objectliterals.exports
@@ -51,6 +51,10 @@
 @exportObjectLiteralProperty ol.source.BingMapsOptions.key string
 @exportObjectLiteralProperty ol.source.BingMapsOptions.style ol.BingMapsStyle
 
+@exportObjectLiteral ol.source.StamenOptions
+@exportObjectLiteralProperty ol.source.StamenOptions.flavor string|undefined
+@exportObjectLiteralProperty ol.source.StamenOptions.provider string
+
 @exportObjectLiteral ol.source.TiledWMSOptions
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.attributions Array.<ol.Attribution>|undefined
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.params Object
@@ -63,6 +67,16 @@
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.url string|undefined
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.urls Array.<string>|undefined
 
+@exportObjectLiteral ol.tilegrid.TileGridOptions
+@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.extent ol.Extent|undefined
+@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.origin ol.Coordinate|undefined
+@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.origins Array.<ol.Coordinate>|undefined
+@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.resolutions !Array.<number>
+@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.tileSize ol.Size|undefined
+
+@exportObjectLiteral ol.tilegrid.XYZOptions
+@exportObjectLiteralProperty ol.tilegrid.XYZOptions.maxZoom number
+
 @exportObjectLiteral ol.View2DOptions
 @exportObjectLiteralProperty ol.View2DOptions.center ol.Coordinate|undefined
 @exportObjectLiteralProperty ol.View2DOptions.maxResolution number|undefined
diff --git a/src/ol/animation.exports b/src/ol/animation.exports
new file mode 100644
index 0000000000..7286bf8cc3
--- /dev/null
+++ b/src/ol/animation.exports
@@ -0,0 +1,4 @@
+@exportSymbol ol.animation
+@exportProperty ol.animation.createBounce
+@exportProperty ol.animation.createPanFrom
+@exportProperty ol.animation.createSpin
diff --git a/src/ol/map.exports b/src/ol/map.exports
index 85ac465dfd..b8cb394c18 100644
--- a/src/ol/map.exports
+++ b/src/ol/map.exports
@@ -7,4 +7,5 @@
 @exportProperty ol.RendererHint.DOM
 @exportProperty ol.RendererHint.WEBGL
 
-
+@exportSymbol ol.RendererHints
+@exportProperty ol.RendererHints.createFromQueryData
diff --git a/src/ol/source/stamen.exports b/src/ol/source/stamen.exports
index bc110646c5..40b2c8b0e7 100644
--- a/src/ol/source/stamen.exports
+++ b/src/ol/source/stamen.exports
@@ -1,2 +1,21 @@
 @exportSymbol ol.source.Stamen
 
+@exportSymbol ol.source.StamenFlavor
+@exportProperty ol.source.StamenFlavor.TERRAIN_BACKGROUND
+@exportProperty ol.source.StamenFlavor.TERRAIN_LABELS
+@exportProperty ol.source.StamenFlavor.TERRAIN_LINES
+@exportProperty ol.source.StamenFlavor.TONER_2010
+@exportProperty ol.source.StamenFlavor.TONER_2011
+@exportProperty ol.source.StamenFlavor.TONER_2011_LABELS
+@exportProperty ol.source.StamenFlavor.TONER_2011_LINES
+@exportProperty ol.source.StamenFlavor.TONER_2011_LITE
+@exportProperty ol.source.StamenFlavor.TONER_BACKGROUND
+@exportProperty ol.source.StamenFlavor.TONER_HYBRID
+@exportProperty ol.source.StamenFlavor.TONER_LABELS
+@exportProperty ol.source.StamenFlavor.TONER_LINES
+@exportProperty ol.source.StamenFlavor.TONER_LITE
+
+@exportSymbol ol.source.StamenProvider
+@exportProperty ol.source.StamenProvider.TERRAIN
+@exportProperty ol.source.StamenProvider.TONER
+@exportProperty ol.source.StamenProvider.WATERCOLOR
diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js
index 089f8ece76..6c68e8e720 100644
--- a/src/ol/source/stamensource.js
+++ b/src/ol/source/stamensource.js
@@ -1,6 +1,8 @@
 // FIXME Configure minZoom when supported by TileGrid
 
 goog.provide('ol.source.Stamen');
+goog.provide('ol.source.StamenFlavor');
+goog.provide('ol.source.StamenProvider');
 
 goog.require('ol.source.XYZ');
 
@@ -25,13 +27,6 @@ ol.source.StamenFlavor = {
 };
 
 
-/**
- * @typedef {{flavor: (ol.source.StamenFlavor|undefined),
- *            provider: ol.source.StamenProvider}}
- */
-ol.source.StamenOptions;
-
-
 /**
  * @enum {string}
  */
@@ -43,8 +38,7 @@ ol.source.StamenProvider = {
 
 
 /**
- * @type {Object.<ol.source.StamenProvider,
- *                {type: string, minZoom: number, maxZoom: number}>}
+ * @type {Object.<string, {type: string, minZoom: number, maxZoom: number}>}
  */
 ol.source.StamenProviderConfig = {};
 ol.source.StamenProviderConfig[ol.source.StamenProvider.TERRAIN] = {
diff --git a/src/ol/tilegrid/tilegrid.exports b/src/ol/tilegrid/tilegrid.exports
new file mode 100644
index 0000000000..f276cab084
--- /dev/null
+++ b/src/ol/tilegrid/tilegrid.exports
@@ -0,0 +1 @@
+@exportClass ol.tilegrid.TileGrid ol.tilegrid.TileGridOptions
diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js
index 6edd839fa9..188692861c 100644
--- a/src/ol/tilegrid/tilegrid.js
+++ b/src/ol/tilegrid/tilegrid.js
@@ -1,7 +1,6 @@
 // FIXME cope with tile grids whose minium zoom is not zero
 
 goog.provide('ol.tilegrid.TileGrid');
-goog.provide('ol.tilegrid.TileGridOptions');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -20,16 +19,6 @@ goog.require('ol.array');
 ol.DEFAULT_TILE_SIZE = 256;
 
 
-/**
- * @typedef {{extent: (ol.Extent|undefined),
- *            origin: (ol.Coordinate|undefined),
- *            origins: (Array.<ol.Coordinate>|undefined),
- *            resolutions: !Array.<number>,
- *            tileSize: (ol.Size|undefined)}}
- */
-ol.tilegrid.TileGridOptions;
-
-
 
 /**
  * @constructor
diff --git a/src/ol/tilegrid/xyztilegrid.exports b/src/ol/tilegrid/xyztilegrid.exports
new file mode 100644
index 0000000000..dd5b52245c
--- /dev/null
+++ b/src/ol/tilegrid/xyztilegrid.exports
@@ -0,0 +1 @@
+@exportClass ol.tilegrid.XYZ ol.tilegrid.XYZOptions
diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js
index aa30336997..b7b16faf60 100644
--- a/src/ol/tilegrid/xyztilegrid.js
+++ b/src/ol/tilegrid/xyztilegrid.js
@@ -1,5 +1,4 @@
 goog.provide('ol.tilegrid.XYZ');
-goog.provide('ol.tilegrid.XYZOptions');
 
 goog.require('ol.Coordinate');
 goog.require('ol.Projection');
@@ -8,12 +7,6 @@ goog.require('ol.TileRange');
 goog.require('ol.tilegrid.TileGrid');
 
 
-/**
- * @typedef {{maxZoom: number}}
- */
-ol.tilegrid.XYZOptions;
-
-
 
 /**
  * @constructor
diff --git a/src/ol/view2d.exports b/src/ol/view2d.exports
new file mode 100644
index 0000000000..aada08d7f3
--- /dev/null
+++ b/src/ol/view2d.exports
@@ -0,0 +1 @@
+@exportClass ol.View2D ol.View2DOptions