Tidy up #include-s for Intel TBB headers

Remove unused and add missing headers.

include/customizer/cell_customizer.hpp

@@ -6,6 +6,7 @@
 #include "util/query_heap.hpp"
 
 #include <tbb/enumerable_thread_specific.h>
+#include <tbb/parallel_for.h>
 
 #include <unordered_set>
 

include/extractor/scripting_environment.hpp

@@ -10,8 +10,6 @@
 
 #include <boost/optional/optional.hpp>
 
-#include <tbb/concurrent_vector.h>
-
 #include <string>
 #include <vector>
 

include/partition/cell_storage.hpp

@@ -16,6 +16,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range/iterator_range.hpp>
+
 #include <tbb/parallel_sort.h>
 
 #include <algorithm>

include/partition/edge_based_graph_reader.hpp

@@ -10,8 +10,9 @@
 #include "util/dynamic_graph.hpp"
 #include "util/typedefs.hpp"
 
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
 #include <tbb/parallel_reduce.h>
-#include <tbb/parallel_sort.h>
 
 #include <cstdint>
 

include/util/packed_vector.hpp

@@ -10,6 +10,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
+
 #include <tbb/atomic.h>
 
 #include <array>

include/util/static_rtree.hpp

@@ -23,6 +23,7 @@
 #include <boost/format.hpp>
 #include <boost/iostreams/device/mapped_file.hpp>
 
+#include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_sort.h>
 

src/contractor/graph_contractor.cpp

@@ -12,6 +12,7 @@
 
 #include <boost/assert.hpp>
 
+#include <tbb/blocked_range.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_invoke.h>

src/extractor/scripting_environment_lua.cpp

@@ -19,8 +19,6 @@
 
 #include <osmium/osm.hpp>
 
-#include <tbb/parallel_for.h>
-
 #include <memory>
 #include <sstream>
 

src/partition/renumber.cpp

@@ -2,8 +2,6 @@
 
 #include "util/permutation.hpp"
 
-#include <tbb/parallel_sort.h>
-
 namespace osrm
 {
 namespace partition

src/updater/updater.cpp

@@ -33,10 +33,11 @@
 #include <boost/interprocess/mapped_region.hpp>
 
 #include <tbb/blocked_range.h>
-#include <tbb/concurrent_unordered_map.h>
+#include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
-#include <tbb/parallel_for_each.h>
+#include <tbb/parallel_for.h>
 #include <tbb/parallel_invoke.h>
+#include <tbb/parallel_sort.h>
 
 #include <algorithm>
 #include <atomic>