diff --git a/src/lib/Circle.js b/src/lib/Circle.js
index 84a5017d..4609e8ce 100644
--- a/src/lib/Circle.js
+++ b/src/lib/Circle.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/DirectionsRenderer.js b/src/lib/DirectionsRenderer.js
index f971bb3a..55e81504 100644
--- a/src/lib/DirectionsRenderer.js
+++ b/src/lib/DirectionsRenderer.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/FusionTablesLayer.js b/src/lib/FusionTablesLayer.js
index 63193a59..0908df20 100644
--- a/src/lib/FusionTablesLayer.js
+++ b/src/lib/FusionTablesLayer.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from 'lodash';
 
-import { 
-    default as React,
-    PropTypes,
-} from 'react';
+import PropTypes from "prop-types";
+
+import { default as React } from 'react';
 
 import {
     MAP,
diff --git a/src/lib/GoogleMap.js b/src/lib/GoogleMap.js
index 3e8f5d86..5e8a2bb4 100644
--- a/src/lib/GoogleMap.js
+++ b/src/lib/GoogleMap.js
@@ -3,10 +3,9 @@ import _ from "lodash";
 
 import invariant from "invariant";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/InfoWindow.js b/src/lib/InfoWindow.js
index 7c1da343..36e1906d 100644
--- a/src/lib/InfoWindow.js
+++ b/src/lib/InfoWindow.js
@@ -3,11 +3,9 @@ import _ from "lodash";
 
 import invariant from "invariant";
 
-import {
-  default as React,
-  PropTypes,
-  Children,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React, Children } from "react";
 
 import {
   unstable_renderSubtreeIntoContainer,
diff --git a/src/lib/KmlLayer.js b/src/lib/KmlLayer.js
index 9f4ce9fa..625b630c 100644
--- a/src/lib/KmlLayer.js
+++ b/src/lib/KmlLayer.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/Marker.js b/src/lib/Marker.js
index 96d6d4ea..1cc5dde2 100644
--- a/src/lib/Marker.js
+++ b/src/lib/Marker.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/OverlayView.js b/src/lib/OverlayView.js
index 4e6cb1a3..b54b8afc 100644
--- a/src/lib/OverlayView.js
+++ b/src/lib/OverlayView.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/Polygon.js b/src/lib/Polygon.js
index 3ef72c36..4037d41f 100644
--- a/src/lib/Polygon.js
+++ b/src/lib/Polygon.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/Polyline.js b/src/lib/Polyline.js
index 9177b31f..efa9b543 100644
--- a/src/lib/Polyline.js
+++ b/src/lib/Polyline.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/Rectangle.js b/src/lib/Rectangle.js
index 251f3af2..a48cbe63 100644
--- a/src/lib/Rectangle.js
+++ b/src/lib/Rectangle.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/TrafficLayer.js b/src/lib/TrafficLayer.js
index 10c4049c..15130fce 100644
--- a/src/lib/TrafficLayer.js
+++ b/src/lib/TrafficLayer.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/_Skeleton.js b/src/lib/_Skeleton.js
index 8ed27495..27c2e098 100644
--- a/src/lib/_Skeleton.js
+++ b/src/lib/_Skeleton.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/addons/InfoBox.js b/src/lib/addons/InfoBox.js
index ea5d1033..10f15237 100644
--- a/src/lib/addons/InfoBox.js
+++ b/src/lib/addons/InfoBox.js
@@ -2,11 +2,9 @@ import _ from "lodash";
 
 import invariant from "invariant";
 
-import {
-  default as React,
-  PropTypes,
-  Children,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React, Children } from "react";
 
 import {
   unstable_renderSubtreeIntoContainer,
diff --git a/src/lib/addons/MarkerClusterer.js b/src/lib/addons/MarkerClusterer.js
index 1cd85d40..5546f4ed 100644
--- a/src/lib/addons/MarkerClusterer.js
+++ b/src/lib/addons/MarkerClusterer.js
@@ -1,9 +1,8 @@
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import MarkerClustererPlus from "marker-clusterer-plus";
 
diff --git a/src/lib/async/withScriptjs.js b/src/lib/async/withScriptjs.js
index 3f63e743..ff37c83e 100644
--- a/src/lib/async/withScriptjs.js
+++ b/src/lib/async/withScriptjs.js
@@ -6,11 +6,9 @@ import canUseDOM from "can-use-dom";
 
 import getDisplayName from "react-display-name";
 
-import {
-  default as React,
-  PropTypes,
-  Component,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React, Component } from "react";
 
 const LOADING_STATE_NONE = `NONE`;
 const LOADING_STATE_BEGIN = `BEGIN`;
diff --git a/src/lib/drawing/DrawingManager.js b/src/lib/drawing/DrawingManager.js
index e9c63934..a148198d 100644
--- a/src/lib/drawing/DrawingManager.js
+++ b/src/lib/drawing/DrawingManager.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/places/SearchBox.js b/src/lib/places/SearchBox.js
index aef25413..2ab18a65 100644
--- a/src/lib/places/SearchBox.js
+++ b/src/lib/places/SearchBox.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/visualization/HeatmapLayer.js b/src/lib/visualization/HeatmapLayer.js
index fbb9cd99..c41daa82 100644
--- a/src/lib/visualization/HeatmapLayer.js
+++ b/src/lib/visualization/HeatmapLayer.js
@@ -1,10 +1,9 @@
 /* global google */
 import _ from "lodash";
 
-import {
-  default as React,
-  PropTypes,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React } from "react";
 
 import {
   MAP,
diff --git a/src/lib/withGoogleMap.js b/src/lib/withGoogleMap.js
index 43b0922c..ebc2e80d 100644
--- a/src/lib/withGoogleMap.js
+++ b/src/lib/withGoogleMap.js
@@ -5,11 +5,9 @@ import invariant from "invariant";
 
 import getDisplayName from "react-display-name";
 
-import {
-  default as React,
-  PropTypes,
-  Component,
-} from "react";
+import PropTypes from "prop-types";
+
+import { default as React, Component } from "react";
 
 import {
   MAP,