Fix include paths

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)
 {