3 files changed, 20 insertions, 20 deletions
diff --git a/test/fixtures/fixture_log.cpp b/test/fixtures/fixture_log.cpp
index c2c10fc9eb..1b1646e665 100644
--- a/test/fixtures/fixture_log.cpp
+++ b/test/fixtures/fixture_log.cpp
@@ -9,25 +9,25 @@ FixtureLogBackend::~FixtureLogBackend() {
 }
 
 size_t FixtureLogBackend::count(const LogMessage &message) const {
-    size_t count = 0;
+    size_t message_count = 0;
     for (const LogMessage &msg : messages) {
         if (msg == message) {
-            count++;
+            message_count++;
             msg.checked = true;
         }
     }
-    return count;
+    return message_count;
 }
 
 std::vector<FixtureLogBackend::LogMessage> FixtureLogBackend::unchecked() const {
-    std::vector<LogMessage> unchecked;
+    std::vector<LogMessage> unchecked_messages;
     for (const LogMessage &msg : messages) {
         if (!msg.checked) {
-            unchecked.push_back(msg);
+            unchecked_messages.push_back(msg);
             msg.checked = true;
         }
     }
-    return unchecked;
+    return unchecked_messages;
 }
 
 ::std::ostream& operator<<(::std::ostream& os, const std::vector<FixtureLogBackend::LogMessage>& messages) {
diff --git a/test/fixtures/fixture_log.hpp b/test/fixtures/fixture_log.hpp
index 263871575b..99097a2c47 100644
--- a/test/fixtures/fixture_log.hpp
+++ b/test/fixtures/fixture_log.hpp
@@ -3,8 +3,7 @@
 
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/noncopyable.hpp>
-
-#include <boost/optional.hpp>
+#include <mbgl/util/optional.hpp>
 
 #include <vector>
 #include <cstdarg>
@@ -14,14 +13,14 @@ namespace mbgl {
 class FixtureLogBackend : public LogBackend, private util::noncopyable {
 public:
     struct LogMessage {
-        inline LogMessage(EventSeverity severity, Event event, int64_t code, const std::string &msg)
-            : severity(severity), event(event), code(code), msg(msg) {}
-        inline LogMessage(EventSeverity severity, Event event, int64_t code)
-            : severity(severity), event(event), code(code) {}
-        inline LogMessage(EventSeverity severity, Event event, const std::string &msg)
-            : severity(severity), event(event), msg(msg) {}
-        inline LogMessage(EventSeverity severity, Event event)
-            : severity(severity), event(event) {}
+        inline LogMessage(EventSeverity severity_, Event event_, int64_t code_, const std::string &msg_)
+            : severity(severity_), event(event_), code(code_), msg(msg_) {}
+        inline LogMessage(EventSeverity severity_, Event event_, int64_t code_)
+            : severity(severity_), event(event_), code(code_), msg() {}
+        inline LogMessage(EventSeverity severity_, Event event_, const std::string &msg_)
+            : severity(severity_), event(event_), code(), msg(msg_) {}
+        inline LogMessage(EventSeverity severity_, Event event_)
+            : severity(severity_), event(event_), code(), msg() {}
 
         inline bool operator==(const LogMessage &rhs) const {
             return (!severity || !rhs.severity || severity.get() == rhs.severity.get()) &&
@@ -30,10 +29,10 @@ public:
                    (!msg || !rhs.msg || msg.get() == rhs.msg.get());
         }
 
-        const boost::optional<EventSeverity> severity;
-        const boost::optional<Event> event;
-        const boost::optional<int64_t> code;
-        const boost::optional<std::string> msg;
+        const mapbox::util::optional<EventSeverity> severity;
+        const mapbox::util::optional<Event> event;
+        const mapbox::util::optional<int64_t> code;
+        const mapbox::util::optional<std::string> msg;
 
         mutable bool checked = false;
     };
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp
index d1687bbf57..f3b41681a6 100644
--- a/test/fixtures/fixture_request.cpp
+++ b/test/fixtures/fixture_request.cpp
@@ -4,6 +4,7 @@
 #include <mbgl/util/url.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/platform/log.hpp>
+#include <iostream>
 
 #include <uv.h>