diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp
index 5b33fd699..079947e77 100644
--- a/include/mbgl/platform/default/headless_display.hpp
+++ b/include/mbgl/platform/default/headless_display.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_COMMON_HEADLESS_DISPLAY
 #define MBGL_COMMON_HEADLESS_DISPLAY
 
-#include "headless_view.hpp"
+#include <mbgl/platform/headless_view.hpp>
 
 namespace mbgl {
 
diff --git a/include/mbgl/platform/log.hpp b/include/mbgl/platform/log.hpp
index 418160d3e..b95895fd1 100644
--- a/include/mbgl/platform/log.hpp
+++ b/include/mbgl/platform/log.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_PLATFORM_LOG
 #define MBGL_PLATFORM_LOG
 
-#include "event.hpp"
+#include <mbgl/platform/event.hpp>
 
 #include <mbgl/util/std.hpp>
 
diff --git a/include/mbgl/storage/caching_http_file_source.hpp b/include/mbgl/storage/caching_http_file_source.hpp
index a093ef244..08fd5b50c 100644
--- a/include/mbgl/storage/caching_http_file_source.hpp
+++ b/include/mbgl/storage/caching_http_file_source.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
 #define MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
 
-#include "file_source.hpp"
+#include <mbgl/storage/file_source.hpp>
 
 #include <thread>
 #include <unordered_map>
diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index eeda529bf..accdc3c49 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -2,8 +2,8 @@
 #define MBGL_STORAGE_FILE_SOURCE
 
 #include <mbgl/util/noncopyable.hpp>
-#include "resource_type.hpp"
-#include "request.hpp"
+#include <mbgl/storage/resource_type.hpp>
+#include <mbgl/storage/request.hpp>
 
 #include <string>
 #include <functional>
diff --git a/include/mbgl/storage/http_request_baton.hpp b/include/mbgl/storage/http_request_baton.hpp
index 74c0ff498..545f9e236 100644
--- a/include/mbgl/storage/http_request_baton.hpp
+++ b/include/mbgl/storage/http_request_baton.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STORAGE_HTTP_REQUEST_BATON
 #define MBGL_STORAGE_HTTP_REQUEST_BATON
 
-#include "response.hpp"
+#include <mbgl/storage/response.hpp>
 #include <mbgl/util/ptr.hpp>
 
 #include <string>
diff --git a/include/mbgl/storage/request.hpp b/include/mbgl/storage/request.hpp
index f63283aa2..845c9a6da 100644
--- a/include/mbgl/storage/request.hpp
+++ b/include/mbgl/storage/request.hpp
@@ -1,8 +1,8 @@
 #ifndef MBGL_STORAGE_REQUEST
 #define MBGL_STORAGE_REQUEST
 
-#include "request_callback.hpp"
-#include "response.hpp"
+#include <mbgl/storage/request_callback.hpp>
+#include <mbgl/storage/response.hpp>
 
 #include <mbgl/util/ptr.hpp>
 
diff --git a/include/mbgl/util/math.hpp b/include/mbgl/util/math.hpp
index 2bef5b18e..e800fc784 100644
--- a/include/mbgl/util/math.hpp
+++ b/include/mbgl/util/math.hpp
@@ -4,7 +4,7 @@
 #include <cmath>
 #include <array>
 
-#include "vec.hpp"
+#include <mbgl/util/vec.hpp>
 
 namespace mbgl {
 namespace util {
diff --git a/include/mbgl/util/variant.hpp b/include/mbgl/util/variant.hpp
index 3b5659425..2de195cd6 100644
--- a/include/mbgl/util/variant.hpp
+++ b/include/mbgl/util/variant.hpp
@@ -10,7 +10,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "recursive_wrapper.hpp"
+#include <mbgl/util/recursive_wrapper.hpp>
 
 #ifdef _MSC_VER
  // http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx