From a6d406d2c3721642ffd18879311a94e5d47c1f07 Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Fri, 12 Feb 2016 15:40:17 -0800
Subject: [PATCH] Fix headers for JSON abstractions

---
 include/util/json_container.hpp | 12 ++++++------
 include/util/json_renderer.hpp  |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/util/json_container.hpp b/include/util/json_container.hpp
index d3a9ca4a8f5..b5b14a1435b 100644
--- a/include/util/json_container.hpp
+++ b/include/util/json_container.hpp
@@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <variant/variant.hpp>
 
-#include <iostream>
 #include <vector>
 #include <string>
+#include <utility>
 #include <unordered_map>
 
 namespace osrm
@@ -52,16 +52,16 @@ struct Array;
 
 struct String
 {
-    String() {}
-    String(const char *value) : value(value) {}
-    String(std::string value) : value(std::move(value)) {}
+    String() = default;
+    String(const char *value_) : value{value_} {}
+    String(std::string value_) : value{std::move(value_)} {}
     std::string value;
 };
 
 struct Number
 {
-    Number() {}
-    Number(double value) : value(static_cast<double>(value)) {}
+    Number() = default;
+    Number(double value_) : value{value_} {}
     double value;
 };
 
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index 9569829f025..a1ac7a04a55 100644
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@@ -9,6 +9,11 @@
 
 #include "osrm/json_container.hpp"
 
+#include <ostream>
+#include <vector>
+#include <iterator>
+#include <string>
+
 namespace osrm
 {
 namespace util