diff --git a/include/engine/guidance/assemble_leg.hpp b/include/engine/guidance/assemble_leg.hpp
index 90fa583ac..e1f846bb4 100644
--- a/include/engine/guidance/assemble_leg.hpp
+++ b/include/engine/guidance/assemble_leg.hpp
@@ -11,6 +11,9 @@
 
 #include <vector>
 #include <array>
+#include <string>
+#include <utility>
+#include <numeric>
 #include <algorithm>
 
 namespace osrm
diff --git a/src/engine/hint.cpp b/src/engine/hint.cpp
index 620670957..d031fbe29 100644
--- a/src/engine/hint.cpp
+++ b/src/engine/hint.cpp
@@ -50,8 +50,7 @@ Hint Hint::FromBase64(const std::string &base64Hint)
 
 bool operator==(const Hint &lhs, const Hint &rhs)
 {
-    return std::tie(lhs.phantom, lhs.data_checksum) ==
-           std::tie(rhs.phantom, rhs.data_checksum);
+    return std::tie(lhs.phantom, lhs.data_checksum) == std::tie(rhs.phantom, rhs.data_checksum);
 }
 
 std::ostream &operator<<(std::ostream &out, const Hint &hint) { return out << hint.ToBase64(); }
diff --git a/unit_tests/engine/base64.cpp b/unit_tests/engine/base64.cpp
index 1a05fb56c..b29e7d046 100644
--- a/unit_tests/engine/base64.cpp
+++ b/unit_tests/engine/base64.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip)
 
     const Coordinate coordinate;
     const PhantomNode phantom;
-    const osrm::test::MockDataFacade facade;
+    const osrm::test::MockDataFacade facade{};
 
     const Hint hint{coordinate, phantom, facade.GetCheckSum()};
 
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip_bytewise)
 
     const Coordinate coordinate;
     const PhantomNode phantom;
-    const osrm::test::MockDataFacade facade;
+    const osrm::test::MockDataFacade facade{};
 
     const Hint hint{coordinate, phantom, facade.GetCheckSum()};