Fix include paths

src/benchmarks/static_rtree.cpp

@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/static_rtree.hpp"
-#include "../data_structures/edge_based_node.hpp"
-#include "../algorithms/geospatial_query.hpp"
-#include "../util/timing_util.hpp"
+#include "extractor/query_node.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/edge_based_node.hpp"
+#include "engine/geospatial_query.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <random>
 #include <iostream>

src/contractor/contractor_options.cpp

@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "contractor_options.hpp"
+#include "contractor/contractor_options.hpp"
 
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>

src/contractor/processing_chain.cpp

@@ -25,22 +25,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "processing_chain.hpp"
-#include "contractor.hpp"
+#include "contractor/processing_chain.hpp"
+#include "contractor/contractor.hpp"
 
-#include "contractor.hpp"
+#include "contractor/contractor.hpp"
 
-#include "../data_structures/deallocating_vector.hpp"
+#include "util/deallocating_vector.hpp"
 
-#include "../algorithms/crc32_processor.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/string_util.hpp"
-#include "../util/timing_util.hpp"
-#include "../typedefs.h"
+#include "contractor/crc32_processor.hpp"
+#include "util/graph_loader.hpp"
+#include "util/integer_range.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/string_util.hpp"
+#include "util/timing_util.hpp"
+#include "util/typedefs.hpp"
 
 #include <fast-cpp-csv-parser/csv.h>
 
@@ -55,7 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <thread>
 #include <vector>
 
-#include "../util/debug_geometry.hpp"
+#include "util/debug_geometry.hpp"
 
 Prepare::~Prepare() {}
 

src/engine/descriptors/description_factory.cpp

@@ -25,15 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "description_factory.hpp"
+#include "engine/descriptors/description_factory.hpp"
 
-#include "../algorithms/polyline_formatter.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/internal_route_result.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../util/container.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "engine/polyline_formatter.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "engine/internal_route_result.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/container.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 DescriptionFactory::DescriptionFactory() : entire_length(0) { via_indices.push_back(0); }
 

src/engine/douglas_peucker.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "douglas_peucker.hpp"
+#include "engine/douglas_peucker.hpp"
 
-#include "../data_structures/segment_information.hpp"
+#include "engine/segment_information.hpp"
 
 #include <boost/assert.hpp>
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 #include <algorithm>

src/engine/osrm_impl.cpp

@@ -33,30 +33,30 @@ class named_mutex;
 }
 }
 
-#include "osrm_impl.hpp"
+#include "engine/osrm_impl.hpp"
 
-#include "../plugins/distance_table.hpp"
-#include "../plugins/hello_world.hpp"
-#include "../plugins/nearest.hpp"
-#include "../plugins/timestamp.hpp"
-#include "../plugins/trip.hpp"
-#include "../plugins/viaroute.hpp"
-#include "../plugins/match.hpp"
-#include "../server/data_structures/datafacade_base.hpp"
-#include "../server/data_structures/internal_datafacade.hpp"
-#include "../server/data_structures/shared_barriers.hpp"
-#include "../server/data_structures/shared_datafacade.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/routed_options.hpp"
-#include "../util/simple_logger.hpp"
+#include "engine/plugins/distance_table.hpp"
+#include "engine/plugins/hello_world.hpp"
+#include "engine/plugins/nearest.hpp"
+#include "engine/plugins/timestamp.hpp"
+#include "engine/plugins/trip.hpp"
+#include "engine/plugins/viaroute.hpp"
+#include "engine/plugins/match.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/datafacade/internal_datafacade.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
+#include "engine/datafacade/shared_datafacade.hpp"
+#include "util/make_unique.hpp"
+#include "util/routed_options.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/interprocess/sync/named_condition.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 
-#include <osrm/route_parameters.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/route_parameters.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/osrm.hpp"
 
 #include <algorithm>
 #include <fstream>

src/engine/phantom_node.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "phantom_node.hpp"
+#include "engine/phantom_node.hpp"
 
-#include "../typedefs.h"
-#include "travel_mode.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/travel_mode.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 

src/engine/polyline_compressor.cpp

@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "polyline_compressor.hpp"
-#include "../data_structures/segment_information.hpp"
+#include "engine/polyline_compressor.hpp"
+#include "engine/segment_information.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 std::string PolylineCompressor::encode_vector(std::vector<int> &numbers) const
 {

src/engine/polyline_formatter.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "polyline_formatter.hpp"
+#include "engine/polyline_formatter.hpp"
 
-#include "polyline_compressor.hpp"
-#include "../data_structures/segment_information.hpp"
+#include "engine/polyline_compressor.hpp"
+#include "engine/segment_information.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 osrm::json::String
 PolylineFormatter::printEncodedString(const std::vector<SegmentInformation> &polyline) const

src/engine/route_parameters.cpp

@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/fusion/include/at_c.hpp>
 #include <boost/spirit/include/qi.hpp>
 
-#include <osrm/route_parameters.hpp>
+#include "osrm/route_parameters.hpp"
 
-#include "../algorithms/polyline_compressor.hpp"
+#include "engine/polyline_compressor.hpp"
 
 RouteParameters::RouteParameters()
     : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true),

src/engine/search_engine_data.cpp

@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "search_engine_data.hpp"
+#include "engine/search_engine_data.hpp"
 
-#include "binary_heap.hpp"
+#include "util/binary_heap.hpp"
 
 void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes)
 {

src/extractor/compressed_edge_container.cpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "compressed_edge_container.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>

src/extractor/edge_based_graph_factory.cpp

@@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "edge_based_graph_factory.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/percent.hpp"
-#include "../util/compute_angle.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/osrm_exception.hpp"
+#include "extractor/edge_based_graph_factory.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "util/percent.hpp"
+#include "util/compute_angle.hpp"
+#include "util/integer_range.hpp"
+#include "util/lua_util.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/osrm_exception.hpp"
 
-#include "../util/debug_geometry.hpp"
+#include "util/debug_geometry.hpp"
 
 #include <boost/assert.hpp>
 

src/extractor/external_memory_node.cpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "external_memory_node.hpp"
-#include "query_node.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/query_node.hpp"
 
 #include <limits>
 

src/extractor/extraction_containers.cpp

@@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extraction_containers.hpp"
-#include "extraction_way.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/node_id.hpp"
-#include "../data_structures/range_table.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "extractor/node_id.hpp"
+#include "util/range_table.hpp"
 
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/fingerprint.hpp"
-#include "../util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/fingerprint.hpp"
+#include "util/lua_util.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>

src/extractor/extractor.cpp

@@ -25,31 +25,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor.hpp"
+#include "extractor/extractor.hpp"
 
-#include "extraction_containers.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
-#include "extractor_callbacks.hpp"
-#include "restriction_parser.hpp"
-#include "scripting_environment.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
+#include "extractor/extractor_callbacks.hpp"
+#include "extractor/restriction_parser.hpp"
+#include "extractor/scripting_environment.hpp"
 
-#include "../data_structures/raster_source.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/graph_loader.hpp"
+#include "extractor/raster_source.hpp"
+#include "util/make_unique.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/lua_util.hpp"
+#include "util/graph_loader.hpp"
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
-#include "../data_structures/static_graph.hpp"
-#include "../data_structures/static_rtree.hpp"
-#include "../data_structures/restriction_map.hpp"
-#include "../data_structures/compressed_edge_container.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/restriction_map.hpp"
+#include "extractor/compressed_edge_container.hpp"
 
-#include "../algorithms/tarjan_scc.hpp"
-#include "../algorithms/crc32_processor.hpp"
+#include "extractor/tarjan_scc.hpp"
+#include "contractor/crc32_processor.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

src/extractor/extractor_callbacks.cpp

@@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor_callbacks.hpp"
-#include "extraction_containers.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
+#include "extractor/extractor_callbacks.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/restriction.hpp"
-#include "../util/container.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/restriction.hpp"
+#include "util/container.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/optional/optional.hpp>
 
 #include <osmium/osm.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 #include <string>

src/extractor/extractor_options.cpp

@@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor_options.hpp"
+#include "extractor/extractor_options.hpp"
 
 #include "util/version.hpp"
-#include "../util/ini_file.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>

src/extractor/graph_compressor.cpp

@@ -1,12 +1,12 @@
-#include "graph_compressor.hpp"
+#include "extractor/graph_compressor.hpp"
 
-#include "../data_structures/compressed_edge_container.hpp"
-#include "../data_structures/dynamic_graph.hpp"
-#include "../data_structures/node_based_graph.hpp"
-#include "../data_structures/restriction_map.hpp"
-#include "../data_structures/percent.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/dynamic_graph.hpp"
+#include "util/node_based_graph.hpp"
+#include "extractor/restriction_map.hpp"
+#include "util/percent.hpp"
 
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 GraphCompressor::GraphCompressor(SpeedProfileProperties speed_profile)
     : speed_profile(std::move(speed_profile))

src/extractor/import_edge.cpp

@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "import_edge.hpp"
+#include "extractor/import_edge.hpp"
 
-#include "travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 bool NodeBasedEdge::operator<(const NodeBasedEdge &other) const
 {

src/extractor/raster_source.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "raster_source.hpp"
+#include "extractor/raster_source.hpp"
 
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 

src/extractor/restriction_map.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "restriction_map.hpp"
+#include "extractor/restriction_map.hpp"
 
 RestrictionMap::RestrictionMap(const std::vector<TurnRestriction> &restriction_list) : m_count(0)
 {

src/extractor/restriction_parser.cpp

@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "restriction_parser.hpp"
-#include "extraction_way.hpp"
+#include "extractor/restriction_parser.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/regex.hpp>

src/extractor/scripting_environment.cpp

@@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "scripting_environment.hpp"
+#include "extractor/scripting_environment.hpp"
 
-#include "extraction_helper_functions.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
-#include "internal_extractor_edge.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/raster_source.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../typedefs.h"
+#include "extractor/extraction_helper_functions.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
+#include "extractor/internal_extractor_edge.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/raster_source.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/typedefs.hpp"
 
 #include <luabind/tag_function.hpp>
 #include <luabind/operator.hpp>

src/server/connection.cpp

@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "connection.hpp"
-#include "request_handler.hpp"
-#include "request_parser.hpp"
+#include "server/connection.hpp"
+#include "server/request_handler.hpp"
+#include "server/request_parser.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>

src/server/http/reply.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "reply.hpp"
+#include "server/http/reply.hpp"
 
 #include <string>
 

src/server/request_handler.cpp

@@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "request_handler.hpp"
+#include "server/request_handler.hpp"
 
-#include "api_grammar.hpp"
-#include "http/reply.hpp"
-#include "http/request.hpp"
+#include "server/api_grammar.hpp"
+#include "server/http/reply.hpp"
+#include "server/http/request.hpp"
 
-#include "../util/json_renderer.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/string_util.hpp"
-#include "../util/xml_renderer.hpp"
-#include "../typedefs.h"
+#include "util/json_renderer.hpp"
+#include "util/simple_logger.hpp"
+#include "util/string_util.hpp"
+#include "util/xml_renderer.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/route_parameters.hpp>
-#include <osrm/json_container.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/route_parameters.hpp"
+#include "osrm/json_container.hpp"
+#include "osrm/osrm.hpp"
 
 #include <ctime>
 

src/server/request_parser.cpp

@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "request_parser.hpp"
+#include "server/request_parser.hpp"
 
-#include "http/compression_type.hpp"
-#include "http/header.hpp"
-#include "http/request.hpp"
+#include "server/http/compression_type.hpp"
+#include "server/http/header.hpp"
+#include "server/http/request.hpp"
 
-#include "../data_structures/tribool.hpp"
+#include "util/tribool.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 

src/tools/check-hsgr.cpp

@@ -24,13 +24,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#include "../data_structures/percent.hpp"
-#include "../data_structures/query_edge.hpp"
-#include "../data_structures/static_graph.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/osrm_exception.hpp"
+#include "util/percent.hpp"
+#include "contractor/query_edge.hpp"
+#include "util/static_graph.hpp"
+#include "util/integer_range.hpp"
+#include "util/graph_loader.hpp"
+#include "util/simple_logger.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>

src/tools/components.cpp

@@ -25,16 +25,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../typedefs.h"
-#include "../algorithms/tarjan_scc.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/dynamic_graph.hpp"
-#include "../data_structures/static_graph.hpp"
-#include "../util/fingerprint.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/tarjan_scc.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "util/dynamic_graph.hpp"
+#include "util/static_graph.hpp"
+#include "util/fingerprint.hpp"
+#include "util/graph_loader.hpp"
+#include "util/make_unique.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 
@@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gdal/ogrsf_frmts.h>
 #endif
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <fstream>
 #include <memory>

src/tools/datastore.cpp

@@ -25,26 +25,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "data_structures/original_edge_data.hpp"
-#include "data_structures/range_table.hpp"
-#include "data_structures/query_edge.hpp"
-#include "data_structures/query_node.hpp"
-#include "data_structures/shared_memory_factory.hpp"
-#include "data_structures/shared_memory_vector_wrapper.hpp"
-#include "data_structures/static_graph.hpp"
-#include "data_structures/static_rtree.hpp"
-#include "data_structures/travel_mode.hpp"
-#include "data_structures/turn_instructions.hpp"
-#include "server/data_structures/datafacade_base.hpp"
-#include "server/data_structures/shared_datatype.hpp"
-#include "server/data_structures/shared_barriers.hpp"
+#include "extractor/original_edge_data.hpp"
+#include "util/range_table.hpp"
+#include "contractor/query_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/travel_mode.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/datafacade/shared_datatype.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
 #include "util/datastore_options.hpp"
 #include "util/simple_logger.hpp"
 #include "util/osrm_exception.hpp"
 #include "util/fingerprint.hpp"
-#include "typedefs.h"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 using RTreeLeaf = BaseDataFacade<QueryEdge::EdgeData>::RTreeLeaf;
 using RTreeNode = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode;

src/tools/io-benchmark.cpp

@@ -26,9 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

src/tools/routed.cpp

@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/routed_options.hpp"
 #include "util/simple_logger.hpp"
 
-#include <osrm/osrm.hpp>
-#include <osrm/libosrm_config.hpp>
+#include "osrm/osrm.hpp"
+#include "osrm/libosrm_config.hpp"
 
 #ifdef __linux__
 #include <sys/mman.h>

src/tools/simpleclient.cpp

@@ -26,14 +26,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/json_renderer.hpp"
-#include "../util/routed_options.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/json_renderer.hpp"
+#include "util/routed_options.hpp"
+#include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/route_parameters.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/json_container.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/route_parameters.hpp"
+#include "osrm/osrm.hpp"
 
 #include <string>
 

src/tools/springclean.cpp

@@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdio>
 
-#include "../data_structures/shared_memory_factory.hpp"
-#include "../server/data_structures/shared_datatype.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "engine/datafacade/shared_datatype.hpp"
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 void delete_region(const SharedDataType region)
 {

src/tools/unlock_all_mutexes.cpp

@@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
-#include "../server/data_structures/shared_barriers.hpp"
+#include "util/simple_logger.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
 
 #include <iostream>
 

src/util/compute_angle.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "compute_angle.hpp"
+#include "util/compute_angle.hpp"
 
-#include "trigonometry_table.hpp"
-#include "../util/mercator.hpp"
+#include "util/trigonometry_table.hpp"
+#include "util/mercator.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 

src/util/coordinate.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #ifndef NDEBUG
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 #endif
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #ifndef NDEBUG
 #include <bitset>

src/util/coordinate_calculation.cpp

@@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
-#include "../util/mercator.hpp"
-#include "../util/string_util.hpp"
+#include "util/mercator.hpp"
+#include "util/string_util.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 

src/util/hilbert_value.cpp

@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "hilbert_value.hpp"
+#include "util/hilbert_value.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 uint64_t HilbertCode::operator()(const FixedPointCoordinate &current_coordinate) const
 {

src/util/mercator.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "mercator.hpp"
+#include "util/mercator.hpp"
 
 #include <cmath>
 

src/util/osrm_exception.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "osrm_exception.hpp"
+#include "util/osrm_exception.hpp"
 
 namespace osrm
 {

src/util/simple_logger.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "simple_logger.hpp"
+#include "util/simple_logger.hpp"
 #ifdef _MSC_VER
 #include <io.h>
 #define isatty _isatty