diff --git a/src/ol/interaction/dragboxinteraction.js b/src/ol/interaction/dragboxinteraction.js
index 3cefb74049..d24e2bee68 100644
--- a/src/ol/interaction/dragboxinteraction.js
+++ b/src/ol/interaction/dragboxinteraction.js
@@ -7,18 +7,13 @@ goog.provide('ol.interaction.DragBox');
 goog.require('goog.asserts');
 goog.require('goog.events.Event');
 goog.require('goog.functions');
+goog.require('ol');
 goog.require('ol.events.ConditionType');
 goog.require('ol.events.condition');
 goog.require('ol.interaction.Pointer');
 goog.require('ol.render.Box');
 
 
-/**
- * @define {number} Hysterisis pixels.
- */
-ol.DRAG_BOX_HYSTERESIS_PIXELS = 8;
-
-
 /**
  * @const
  * @type {number}
diff --git a/src/ol/ol.js b/src/ol/ol.js
index 3a7c355db1..e5c94b8da7 100644
--- a/src/ol/ol.js
+++ b/src/ol/ol.js
@@ -9,6 +9,36 @@ goog.provide('ol');
 ol.ASSUME_TOUCH = false;
 
 
+/**
+ * @define {boolean} Replace unused entries with NaNs.
+ */
+ol.BUFFER_REPLACE_UNUSED_ENTRIES_WITH_NANS = goog.DEBUG;
+
+
+/**
+ * @define {number} Default maximum zoom for default tile grids.
+ */
+ol.DEFAULT_MAX_ZOOM = 42;
+
+
+/**
+ * @define {number} Default high water mark.
+ */
+ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK = 2048;
+
+
+/**
+ * @define {number} Default tile size.
+ */
+ol.DEFAULT_TILE_SIZE = 256;
+
+
+/**
+ * @define {number} Hysterisis pixels.
+ */
+ol.DRAG_BOX_HYSTERESIS_PIXELS = 8;
+
+
 /**
  * @define {boolean} Whether to enable canvas.
  */
@@ -27,6 +57,12 @@ ol.ENABLE_DOM = true;
 ol.ENABLE_IMAGE = true;
 
 
+/**
+ * @define {boolean} Enable Proj4js.
+ */
+ol.ENABLE_PROJ4JS = true;
+
+
 /**
  * @define {boolean} Whether to enable rendering of tile layers.
  */
@@ -68,6 +104,12 @@ ol.IS_LEGACY_IE = goog.userAgent.IE &&
     !goog.userAgent.isVersionOrHigher('9.0') && goog.userAgent.VERSION !== '';
 
 
+/**
+ * @define {number} Texture cache high water mark.
+ */
+ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
+
+
 /**
  * ol.inherits is an alias to the goog.inherits function. It is exported
  * for use in non-compiled application code.
diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index 71601e09e3..bb0fc8e124 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -7,17 +7,12 @@ goog.provide('ol.proj.Units');
 goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.object');
+goog.require('ol');
 goog.require('ol.Extent');
 goog.require('ol.TransformFunction');
 goog.require('ol.sphere.NORMAL');
 
 
-/**
- * @define {boolean} Enable Proj4js.
- */
-ol.ENABLE_PROJ4JS = true;
-
-
 /**
  * Have Proj4js.
  * @const
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 53f2a00bc2..c971e900e8 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -34,12 +34,6 @@ goog.require('ol.webgl.Context');
 goog.require('ol.webgl.WebGLContextEventType');
 
 
-/**
- * @define {number} Texture cache high water mark.
- */
-ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
-
-
 /**
  * @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}}
  */
diff --git a/src/ol/source/zoomifysource.js b/src/ol/source/zoomifysource.js
index ae87d64aae..7c245da695 100644
--- a/src/ol/source/zoomifysource.js
+++ b/src/ol/source/zoomifysource.js
@@ -2,6 +2,7 @@ goog.provide('ol.source.Zoomify');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
+goog.require('ol');
 goog.require('ol.ImageTile');
 goog.require('ol.TileCoord');
 goog.require('ol.TileState');
diff --git a/src/ol/structs/buffer.js b/src/ol/structs/buffer.js
index 31ae062393..29ddb99b56 100644
--- a/src/ol/structs/buffer.js
+++ b/src/ol/structs/buffer.js
@@ -3,6 +3,7 @@ goog.provide('ol.structs.Buffer');
 goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.webgl');
+goog.require('ol');
 goog.require('ol.structs.IntegerSet');
 
 
@@ -16,12 +17,6 @@ ol.structs.BufferUsage = {
 };
 
 
-/**
- * @define {boolean} Replace unused entries with NaNs.
- */
-ol.BUFFER_REPLACE_UNUSED_ENTRIES_WITH_NANS = goog.DEBUG;
-
-
 
 /**
  * @constructor
diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js
index 643ed75ce9..4b7456263b 100644
--- a/src/ol/tilecache.js
+++ b/src/ol/tilecache.js
@@ -1,18 +1,13 @@
 goog.provide('ol.TileCache');
 
 goog.require('goog.asserts');
+goog.require('ol');
 goog.require('ol.Tile');
 goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
 goog.require('ol.structs.LRUCache');
 
 
-/**
- * @define {number} Default high water mark.
- */
-ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK = 2048;
-
-
 
 /**
  * @constructor
diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js
index beaf508869..5e626aeff3 100644
--- a/src/ol/tilegrid/tilegrid.js
+++ b/src/ol/tilegrid/tilegrid.js
@@ -2,6 +2,7 @@ goog.provide('ol.tilegrid.TileGrid');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
+goog.require('ol');
 goog.require('ol.Coordinate');
 goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
@@ -12,18 +13,6 @@ goog.require('ol.proj.Projection');
 goog.require('ol.proj.Units');
 
 
-/**
- * @define {number} Default tile size.
- */
-ol.DEFAULT_TILE_SIZE = 256;
-
-
-/**
- * @define {number} Default maximum zoom for default tile grids.
- */
-ol.DEFAULT_MAX_ZOOM = 42;
-
-
 
 /**
  * @constructor
diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js
index 75a63200b5..a60a5bfdb9 100644
--- a/src/ol/tilegrid/xyztilegrid.js
+++ b/src/ol/tilegrid/xyztilegrid.js
@@ -1,6 +1,7 @@
 goog.provide('ol.tilegrid.XYZ');
 
 goog.require('goog.math');
+goog.require('ol');
 goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
 goog.require('ol.proj');
diff --git a/src/ol/view2d.js b/src/ol/view2d.js
index 0a20d803c7..bd78045ac2 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');
 goog.require('ol.CenterConstraint');
 goog.require('ol.Constraints');
 goog.require('ol.IView2D');