diff --git a/linux/main.cpp b/linux/main.cpp
index 4ccf7f352..bb571a009 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -1,6 +1,5 @@
 #include <mbgl/mbgl.hpp>
 #include <mbgl/util/default_styles.hpp>
-#include <mbgl/util/uv.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/default/settings_json.hpp>
diff --git a/platform/android/asset_root.cpp b/platform/android/asset_root.cpp
index 4069211f6..398e18aa1 100644
--- a/platform/android/asset_root.cpp
+++ b/platform/android/asset_root.cpp
@@ -1,7 +1,6 @@
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/android/jni.hpp>
 
-#include <uv.h>
 #include <libgen.h>
 
 namespace mbgl {
diff --git a/src/mbgl/sprite/sprite_store.cpp b/src/mbgl/sprite/sprite_store.cpp
index 8e0022905..f54f3f18f 100644
--- a/src/mbgl/sprite/sprite_store.cpp
+++ b/src/mbgl/sprite/sprite_store.cpp
@@ -6,8 +6,8 @@
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/exception.hpp>
 #include <mbgl/util/thread_context.hpp>
-#include <mbgl/util/run_loop.hpp>
 
+#include <cassert>
 #include <string>
 #include <sstream>
 
diff --git a/src/mbgl/style/class_dictionary.cpp b/src/mbgl/style/class_dictionary.cpp
index ba7c0d55b..021f791ad 100644
--- a/src/mbgl/style/class_dictionary.cpp
+++ b/src/mbgl/style/class_dictionary.cpp
@@ -1,14 +1,12 @@
 #include <mbgl/style/class_dictionary.hpp>
 
-#include <uv.h>
+#include <pthread.h>
 
 namespace mbgl {
 
 ClassDictionary::ClassDictionary() {}
 
 ClassDictionary &ClassDictionary::Get() {
-    // Note: We should eventually switch to uv_key_* functions, but libuv 0.10 doesn't have these
-    // yet. Instead, we're using the pthread functions directly for now.
     static pthread_once_t store_once = PTHREAD_ONCE_INIT;
     static pthread_key_t store_key;
 
diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp
index eb770fbf6..4c9a74b7e 100644
--- a/src/mbgl/text/glyph_store.cpp
+++ b/src/mbgl/text/glyph_store.cpp
@@ -3,6 +3,8 @@
 #include <mbgl/text/glyph_pbf.hpp>
 #include <mbgl/util/thread_context.hpp>
 
+#include <cassert>
+
 namespace mbgl {
 
 void GlyphStore::requestGlyphRange(const std::string& fontStackName, const GlyphRange& range) {
diff --git a/src/mbgl/util/gl_object_store.cpp b/src/mbgl/util/gl_object_store.cpp
index 28a36e663..b4c258279 100644
--- a/src/mbgl/util/gl_object_store.cpp
+++ b/src/mbgl/util/gl_object_store.cpp
@@ -4,6 +4,8 @@
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/platform/gl.hpp>
 
+#include <cassert>
+
 namespace mbgl {
 namespace util {
 
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp
index c4d65ff32..a4c1d9113 100644
--- a/src/mbgl/util/raster.cpp
+++ b/src/mbgl/util/raster.cpp
@@ -3,7 +3,6 @@
 #include <mbgl/platform/log.hpp>
 
 #include <mbgl/util/raster.hpp>
-#include <mbgl/util/uv_detail.hpp>
 
 #include <cassert>
 #include <cstring>
diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp
index 5c65c46e9..64244135d 100644
--- a/src/mbgl/util/raster.hpp
+++ b/src/mbgl/util/raster.hpp
@@ -9,8 +9,6 @@
 
 #include <mutex>
 
-typedef struct uv_loop_s uv_loop_t;
-
 namespace mbgl {
 
 class Raster : public std::enable_shared_from_this<Raster> {
diff --git a/src/mbgl/util/time.cpp b/src/mbgl/util/time.cpp
index 00a3419cc..42d37b6f2 100644
--- a/src/mbgl/util/time.cpp
+++ b/src/mbgl/util/time.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/util/time.hpp>
-#include <mbgl/util/uv_detail.hpp>
 
 #include <cstdio>