diff --git a/externs/olx.js b/externs/olx.js
index 9689d9e241..827f4485d4 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -7012,7 +7012,7 @@ olx.view.FitOptions.prototype.maxZoom;
  *     usedTiles: Object.<string, Object.<string, ol.TileRange>>,
  *     viewState: olx.ViewState,
  *     viewHints: Array.<number>,
- *     wantedTiles: Object.<string, Object.<string, boolean>>}}
+ *     wantedTiles: !Object.<string, Object.<string, boolean>>}}
  * @api
  */
 olx.FrameState;
diff --git a/src/ol/map.js b/src/ol/map.js
index ecd7aa41c7..0ea3ae32c6 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -13,7 +13,6 @@ goog.require('goog.dom.classlist');
 goog.require('goog.functions');
 goog.require('goog.log');
 goog.require('goog.log.Level');
-goog.require('goog.object');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Collection');
@@ -1028,7 +1027,7 @@ ol.Map.prototype.handlePostRender = function() {
         maxTotalLoading = this.loadTilesWhileInteracting_ ? 8 : 0;
         maxNewLoads = 2;
       }
-      tileSourceCount = goog.object.getCount(frameState.wantedTiles);
+      tileSourceCount = Object.keys(frameState.wantedTiles).length;
     }
     maxTotalLoading *= tileSourceCount;
     maxNewLoads *= tileSourceCount;
diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js
index f6eef67ffd..7efa027cbe 100644
--- a/src/ol/mapbrowserevent.js
+++ b/src/ol/mapbrowserevent.js
@@ -4,14 +4,13 @@ goog.provide('ol.MapBrowserEventHandler');
 goog.provide('ol.MapBrowserPointerEvent');
 
 goog.require('goog.asserts');
-goog.require('ol.events');
-goog.require('ol.events.EventTarget');
-goog.require('ol.events.EventType');
-goog.require('goog.object');
 goog.require('ol');
 goog.require('ol.Coordinate');
 goog.require('ol.MapEvent');
 goog.require('ol.Pixel');
+goog.require('ol.events');
+goog.require('ol.events.EventTarget');
+goog.require('ol.events.EventType');
 goog.require('ol.pointer.PointerEvent');
 goog.require('ol.pointer.PointerEventHandler');
 
@@ -176,7 +175,7 @@ ol.MapBrowserEventHandler = function(map) {
   this.activePointers_ = 0;
 
   /**
-   * @type {Object.<number, boolean>}
+   * @type {!Object.<number, boolean>}
    * @private
    */
   this.trackedTouches_ = {};
@@ -254,7 +253,7 @@ ol.MapBrowserEventHandler.prototype.updateActivePointers_ = function(pointerEven
   } else if (event.type == ol.MapBrowserEvent.EventType.POINTERDOWN) {
     this.trackedTouches_[event.pointerId] = true;
   }
-  this.activePointers_ = goog.object.getCount(this.trackedTouches_);
+  this.activePointers_ = Object.keys(this.trackedTouches_).length;
 };
 
 
diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js
index 80098c1d1c..d73786eca1 100644
--- a/src/ol/pointer/touchsource.js
+++ b/src/ol/pointer/touchsource.js
@@ -30,11 +30,10 @@
 
 goog.provide('ol.pointer.TouchSource');
 
-goog.require('goog.object');
 goog.require('ol');
+goog.require('ol.array');
 goog.require('ol.pointer.EventSource');
 goog.require('ol.pointer.MouseSource');
-goog.require('ol.array');
 
 
 /**
@@ -124,7 +123,7 @@ ol.pointer.TouchSource.prototype.isPrimaryTouch_ = function(inTouch) {
  * @private
  */
 ol.pointer.TouchSource.prototype.setPrimaryTouch_ = function(inTouch) {
-  var count = goog.object.getCount(this.pointerMap);
+  var count = Object.keys(this.pointerMap).length;
   if (count === 0 || (count === 1 &&
       ol.pointer.MouseSource.POINTER_ID.toString() in this.pointerMap)) {
     this.firstTouchId_ = inTouch.identifier;
diff --git a/src/ol/source/clustersource.js b/src/ol/source/clustersource.js
index 115cec297c..45a80283f1 100644
--- a/src/ol/source/clustersource.js
+++ b/src/ol/source/clustersource.js
@@ -4,10 +4,9 @@
 goog.provide('ol.source.Cluster');
 
 goog.require('goog.asserts');
-goog.require('ol.events.EventType');
-goog.require('goog.object');
 goog.require('ol.Feature');
 goog.require('ol.coordinate');
+goog.require('ol.events.EventType');
 goog.require('ol.extent');
 goog.require('ol.geom.Point');
 goog.require('ol.source.Vector');
@@ -111,7 +110,7 @@ ol.source.Cluster.prototype.cluster_ = function() {
   var features = this.source_.getFeatures();
 
   /**
-   * @type {Object.<string, boolean>}
+   * @type {!Object.<string, boolean>}
    */
   var clustered = {};
 
@@ -140,7 +139,7 @@ ol.source.Cluster.prototype.cluster_ = function() {
     }
   }
   goog.asserts.assert(
-      goog.object.getCount(clustered) == this.source_.getFeatures().length,
+      Object.keys(clustered).length == this.source_.getFeatures().length,
       'number of clustered equals number of features in the source');
 };
 
diff --git a/src/ol/structs/lrucache.js b/src/ol/structs/lrucache.js
index 93ef30907d..780c525da7 100644
--- a/src/ol/structs/lrucache.js
+++ b/src/ol/structs/lrucache.js
@@ -22,7 +22,7 @@ ol.structs.LRUCache = function() {
 
   /**
    * @private
-   * @type {Object.<string, ol.structs.LRUCacheEntry>}
+   * @type {!Object.<string, ol.structs.LRUCacheEntry>}
    */
   this.entries_ = {};
 
@@ -53,7 +53,7 @@ ol.structs.LRUCache.prototype.assertValid = function() {
     goog.asserts.assert(!this.newest_,
         'newest must be null (count = 0)');
   } else {
-    goog.asserts.assert(goog.object.getCount(this.entries_) == this.count_,
+    goog.asserts.assert(Object.keys(this.entries_).length == this.count_,
         'number of entries matches count');
     goog.asserts.assert(this.oldest_,
         'we have an oldest entry');