diff --git a/include/mbgl/text/collision.hpp b/include/mbgl/text/collision.hpp
index 7e65e979d..8eec30f21 100644
--- a/include/mbgl/text/collision.hpp
+++ b/include/mbgl/text/collision.hpp
@@ -5,8 +5,9 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#ifdef __clang__
 #pragma GCC diagnostic ignored "-Wdeprecated-register"
-#ifndef __clang__
+#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
diff --git a/include/mbgl/text/types.hpp b/include/mbgl/text/types.hpp
index e2539bff6..dbb483ea8 100644
--- a/include/mbgl/text/types.hpp
+++ b/include/mbgl/text/types.hpp
@@ -101,7 +101,7 @@ struct PlacementProperty {
         : zoom(zoom), rotationRange(rotationRange) {}
 
     inline operator bool() const {
-        return !isnan(zoom) && zoom != std::numeric_limits<float>::infinity() &&
+        return !std::isnan(zoom) && zoom != std::numeric_limits<float>::infinity() &&
                rotationRange[0] != rotationRange[1];
     }
 
diff --git a/include/mbgl/util/threadpool.hpp b/include/mbgl/util/threadpool.hpp
deleted file mode 100644
index 497d4e308..000000000
--- a/include/mbgl/util/threadpool.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef MBGL_UTIL_THREADPOOL
-#define MBGL_UTIL_THREADPOOL
-
-#include <pthread.h>
-#include <forward_list>
-#include <queue>
-
-namespace mbgl {
-namespace util {
-
-class Threadpool {
-private:
-    class Worker {
-    public:
-        Worker(Threadpool& pool);
-        ~Worker();
-        static void *loop(void *ptr);
-
-    private:
-        Threadpool& pool;
-        pthread_t thread;
-    };
-
-public:
-    Threadpool(int max_workers = 4);
-    typedef void (*Callback)(void *);
-    void add(Callback callback, void *data);
-
-private:
-    typedef std::pair<Callback, void *> Task;
-    const int max_workers;
-    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-    pthread_cond_t condition = PTHREAD_COND_INITIALIZER;
-    std::forward_list<Worker> workers;
-    int worker_count = 0;
-    std::queue<Task> tasks;
-};
-
-extern std::unique_ptr<Threadpool> threadpool;
-
-}
-}
-
-#endif
-
diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp
index 5dfc4ad2d..bb6317912 100644
--- a/include/mbgl/util/utf.hpp
+++ b/include/mbgl/util/utf.hpp
@@ -4,14 +4,13 @@
 #include <memory>
 
 // g++/libstdc++ is missing c++11 codecvt support
-#ifdef __linux__
+#if ! defined(__clang__) || defined(__linux__)
 #pragma GCC diagnostic push
-#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif
 #include <boost/locale.hpp>
 #pragma GCC diagnostic pop
 #else
+// Assume that codecvt is present on clang on non-linux systems
 #include <codecvt>
 #include <locale>
 #endif
@@ -20,7 +19,7 @@ namespace mbgl {
 
 namespace util {
 
-#ifdef __linux__
+#if ! defined(__clang__) || defined(__linux__)
 
 class utf8_to_utf32 {
  public:
diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp
index 0b9bf63d5..a5fbee477 100644
--- a/include/mbgl/util/vec.hpp
+++ b/include/mbgl/util/vec.hpp
@@ -71,7 +71,7 @@ struct vec2 {
 
     template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
     inline operator bool() const {
-        return !isnan(x) && !isnan(y);
+        return !std::isnan(x) && !std::isnan(y);
     }
 
     template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index 89e91d684..6326bea82 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -166,10 +166,10 @@ float Collision::getPlacementScale(const GlyphBoxes &glyphs, float minPlacementS
                 float s4 = (ob.br.y - nb.tl.y + padding) /
                            (na.y - oa.y); // scale at which new box is to the bottom of old box
 
-                if (isnan(s1) || isnan(s2)) {
+                if (std::isnan(s1) || std::isnan(s2)) {
                     s1 = s2 = 1;
                 }
-                if (isnan(s3) || isnan(s4)) {
+                if (std::isnan(s3) || std::isnan(s4)) {
                     s3 = s4 = 1;
                 }
 
diff --git a/src/text/rotation_range.cpp b/src/text/rotation_range.cpp
index 3ebdfe91c..664ea9c70 100644
--- a/src/text/rotation_range.cpp
+++ b/src/text/rotation_range.cpp
@@ -95,7 +95,7 @@ rotatingRotatingCollisions(const CollisionRect &a, const CollisionRect &b,
     std::vector<float> f;
     for (size_t i = 0; i < c.size(); i++) {
         // Check if they are close enough to collide
-        if (!isnan(c[i]) && d_sq <= e[i]) {
+        if (!std::isnan(c[i]) && d_sq <= e[i]) {
             // So far, angles have been calulated as relative to the vector
             // between anchors.
             // Convert the angles to angles from north.
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
deleted file mode 100644
index f19032ee0..000000000
--- a/src/util/threadpool.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <mbgl/util/threadpool.hpp>
-#include <mbgl/util/std.hpp>
-#include <thread>
-#include <memory>
-
-using namespace mbgl::util;
-
-std::unique_ptr<Threadpool> mbgl::util::threadpool = std::make_unique<Threadpool>(std::thread::hardware_concurrency());
-
-Threadpool::Threadpool(int max_workers)
-    : max_workers(max_workers) {
-}
-
-void Threadpool::add(Callback callback, void *data) {
-    if (worker_count < max_workers) {
-        worker_count++;
-        workers.emplace_front(*this);
-    }
-
-    pthread_mutex_lock(&mutex);
-    tasks.push(std::make_pair(callback, data));
-    pthread_mutex_unlock(&mutex);
-    pthread_cond_signal(&condition);
-}
-
-Threadpool::Worker::Worker(Threadpool& pool)
-    : pool(pool) {
-    pthread_create(&thread, nullptr, loop, (void *)this);
-}
-
-Threadpool::Worker::~Worker() {
-    pthread_cancel(thread);
-}
-
-
-void *Threadpool::Worker::loop(void *ptr) {
-    Worker *worker = static_cast<Worker *>(ptr);
-    Threadpool& pool = worker->pool;
-
-    pthread_mutex_lock(&pool.mutex);
-    while (true) {
-        if (pool.tasks.size()) {
-            Threadpool::Task task = pool.tasks.front();
-            pool.tasks.pop();
-            pthread_mutex_unlock(&pool.mutex);
-            task.first(task.second);
-            pthread_mutex_lock(&pool.mutex);
-        } else {
-            pthread_cond_wait(&pool.condition, &pool.mutex);
-        }
-    }
-
-    return nullptr;
-}