diff --git a/unit_tests/algorithms/douglas_peucker.cpp b/unit_tests/algorithms/douglas_peucker.cpp
index 9654e4da3..8a3920976 100644
--- a/unit_tests/algorithms/douglas_peucker.cpp
+++ b/unit_tests/algorithms/douglas_peucker.cpp
@@ -30,11 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
 #include <osrm/coordinate.hpp>
 
-#include <iostream>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(douglas_peucker)
 
diff --git a/unit_tests/data_structures/binary_heap.cpp b/unit_tests/data_structures/binary_heap.cpp
index 300d8984e..ee22a1fbb 100644
--- a/unit_tests/data_structures/binary_heap.cpp
+++ b/unit_tests/data_structures/binary_heap.cpp
@@ -32,7 +32,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>
 
+#include <algorithm>
+#include <limits>
 #include <random>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(binary_heap)
 
diff --git a/unit_tests/data_structures/dynamic_graph.cpp b/unit_tests/data_structures/dynamic_graph.cpp
index 5082278f0..df8eb21b1 100644
--- a/unit_tests/data_structures/dynamic_graph.cpp
+++ b/unit_tests/data_structures/dynamic_graph.cpp
@@ -26,15 +26,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "../../data_structures/dynamic_graph.hpp"
-#include "../../util/make_unique.hpp"
 #include "../../typedefs.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
-#include <random>
-#include <unordered_map>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(dynamic_graph)
 
diff --git a/unit_tests/data_structures/static_graph.cpp b/unit_tests/data_structures/static_graph.cpp
index 65704c652..ddadd7fdb 100644
--- a/unit_tests/data_structures/static_graph.cpp
+++ b/unit_tests/data_structures/static_graph.cpp
@@ -30,10 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
+#include <algorithm>
 #include <random>
-#include <unordered_map>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(static_graph)
 
diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/data_structures/static_rtree.cpp
index 73fbc88a5..5a3815e62 100644
--- a/unit_tests/data_structures/static_rtree.cpp
+++ b/unit_tests/data_structures/static_rtree.cpp
@@ -35,12 +35,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
 #include <osrm/coordinate.hpp>
 
+#include <cstdint>
+#include <cmath>
+
+#include <algorithm>
+#include <memory>
 #include <random>
+#include <string>
+#include <utility>
 #include <unordered_set>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(static_rtree)