diff --git a/.mason b/.mason
index 0168c4179..39ed569b3 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 0168c417977431d530839c47b96f64a365229a10
+Subproject commit 39ed569b3a3dc1197bc00d423c63800c25dc17f6
diff --git a/configure b/configure
index c3a3ae319..4a62cd1be 100755
--- a/configure
+++ b/configure
@@ -119,9 +119,7 @@ print_flags nunicode static_libs cflags ldflags
 print_flags libzip static_libs cflags ldflags
 print_flags geometry cflags
 print_flags geojson static_libs cflags ldflags
-print_flags geojsonvt cflags
-print_flags supercluster cflags
-print_flags kdbush cflags
+print_flags geojsonvt static_libs cflags ldflags
 print_flags variant cflags
 print_flags rapidjson static_libs cflags ldflags
 print_flags gtest static_libs cflags ldflags
diff --git a/mbgl.gypi b/mbgl.gypi
index 776ce8573..c3dd37b34 100644
--- a/mbgl.gypi
+++ b/mbgl.gypi
@@ -196,8 +196,6 @@
           '<@(geometry_cflags)',
           '<@(geojson_cflags)',
           '<@(geojsonvt_cflags)',
-          '<@(supercluster_cflags)',
-          '<@(kdbush_cflags)',
           '<@(rapidjson_cflags)',
           '<@(variant_cflags)',
           '<@(earcut_cflags)',
diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh
index 40a09f3d5..a9a5b25ff 100644
--- a/platform/android/scripts/configure.sh
+++ b/platform/android/scripts/configure.sh
@@ -12,8 +12,6 @@ LIBZIP_VERSION=0.11.2
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4
 GEOJSONVT_VERSION=6.1.0
-SUPERCLUSTER_VERSION=0.1.0
-KDBUSH_VERSION=0.1.0
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 JNI_HPP_VERSION=2.0.0
diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh
index 13ed9a852..a0791e310 100644
--- a/platform/ios/scripts/configure.sh
+++ b/platform/ios/scripts/configure.sh
@@ -8,8 +8,6 @@ ZLIB_VERSION=system
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4
 GEOJSONVT_VERSION=6.1.0
-SUPERCLUSTER_VERSION=0.1.0
-KDBUSH_VERSION=0.1.0
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh
index 47c9a308f..c4f6dc606 100644
--- a/platform/linux/scripts/configure.sh
+++ b/platform/linux/scripts/configure.sh
@@ -17,8 +17,6 @@ NUNICODE_VERSION=1.6
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4${CXX11ABI:-}
 GEOJSONVT_VERSION=6.1.0
-SUPERCLUSTER_VERSION=0.1.0
-KDBUSH_VERSION=0.1.0
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0${CXX11ABI:-}
diff --git a/platform/macos/scripts/configure.sh b/platform/macos/scripts/configure.sh
index 7141df9ef..47d9b381b 100644
--- a/platform/macos/scripts/configure.sh
+++ b/platform/macos/scripts/configure.sh
@@ -11,8 +11,6 @@ NUNICODE_VERSION=1.6
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4
 GEOJSONVT_VERSION=6.1.0
-SUPERCLUSTER_VERSION=0.1.0
-KDBUSH_VERSION=0.1.0
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh
index 9d30c6438..42541032c 100644
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -8,8 +8,6 @@ BOOST_VERSION=1.60.0
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4${CXX11ABI:-}
 GEOJSONVT_VERSION=6.1.0
-SUPERCLUSTER_VERSION=0.1.0
-KDBUSH_VERSION=0.1.0
 GTEST_VERSION=1.7.0${CXX11ABI:-}
 LIBJPEG_TURBO_VERSION=1.4.2
 NUNICODE_VERSION=1.6
diff --git a/test/test.gypi b/test/test.gypi
index 82bd02bd8..304e0e973 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -103,8 +103,6 @@
           '<@(boost_cflags)',
           '<@(sqlite_cflags)',
           '<@(geojsonvt_cflags)',
-          '<@(supercluster_cflags)',
-          '<@(kdbush_cflags)',
           '<@(rapidjson_cflags)',
           '<@(pixelmatch_cflags)',
           '<@(earcut_cflags)',
@@ -115,7 +113,8 @@
         ],
         'libraries': [
           '<@(gtest_static_libs)',
-          '<@(sqlite_static_libs)'
+          '<@(sqlite_static_libs)',
+          '<@(geojsonvt_static_libs)',
         ],
       },